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

Disable some trace assertions

Browse Source 
Previously some assertions didn't run on the whole trace because of a missing `forAllEntries` statement in the library. When activating this statement these tests fail and should be disabled.

Test: atest FlickerTests WMShellFlickerTests
Bug: 183547024
Bug: 181630910
Change-Id: I28f92e2d9de1a5465a4da5971c438bc4c0b311f9
This commit is contained in:
Nataniel Borges
2021-04-12 14:21:34 +02:00
parent e852b071ff
commit c258d7f4ca
36 changed files with 219 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt
View File

@@ -89,6 +89,12 @@ class AppPairsTestCannotPairNonResizeableApps(
@Test
override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()
@FlakyTest
@Test
override fun navBarLayerIsAlwaysVisible() {
super.navBarLayerIsAlwaysVisible()
}
@Presubmit
@Test
fun appPairsDividerIsInvisible() = testSpec.appPairsDividerIsInvisible()

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt
View File

@@ -103,6 +103,12 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps(
}
}
@FlakyTest
@Test
override fun navBarLayerIsAlwaysVisible() {
super.navBarLayerIsAlwaysVisible()
}
companion object {
@Parameterized.Parameters(name = "{0}")
@JvmStatic

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt
View File

@@ -60,6 +60,12 @@ class RotateTwoLaunchedAppsInAppPairsMode(
}
}
@FlakyTest
@Test
override fun statusBarLayerIsAlwaysVisible() {
super.statusBarLayerIsAlwaysVisible()
}
@Presubmit
@Test
fun bothAppWindowsVisible() {

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt
View File

@@ -74,6 +74,12 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode(
@Test
override fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()
@FlakyTest
@Test
override fun statusBarLayerIsAlwaysVisible() {
super.statusBarLayerIsAlwaysVisible()
}
@Presubmit
@Test
fun bothAppWindowsVisible() {

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsTransition.kt
View File

@@ -52,6 +52,12 @@ abstract class RotateTwoLaunchedAppsTransition(
}
}
@FlakyTest
@Test
override fun navBarLayerIsAlwaysVisible() {
super.navBarLayerIsAlwaysVisible()
}
@FlakyTest
@Test
override fun navBarLayerRotatesAndScales() {

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt
View File

@@ -23,7 +23,7 @@ import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.WALLPAPER_TITLE
import com.android.server.wm.flicker.LAUNCHER_TITLE
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.helpers.launchSplitScreen
import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible
@@ -60,9 +60,9 @@ class EnterSplitScreenDockActivity(
}
override val ignoredWindows: List<String>
get() = listOf(LAUNCHER_PACKAGE_NAME, WALLPAPER_TITLE, LIVE_WALLPAPER_PACKAGE_NAME,
get() = listOf(LAUNCHER_PACKAGE_NAME, LIVE_WALLPAPER_PACKAGE_NAME,
splitScreenApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,
WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME)
WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME, *LAUNCHER_TITLE)
@FlakyTest(bugId = 169271943)
@Test

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt
View File

@@ -84,7 +84,7 @@ class ExitLegacySplitScreenFromBottom(
super.visibleLayersShownMoreThanOneConsecutiveEntry()
}
@Presubmit
@FlakyTest
@Test
fun appWindowBecomesInVisible() =
testSpec.appWindowBecomesInVisible(secondaryApp.defaultWindowName)

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitPrimarySplitScreenShowSecondaryFullscreen.kt
View File

@@ -78,7 +78,7 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen(
@Test
fun dockedStackDividerIsInvisible() = testSpec.dockedStackDividerIsInvisible()
@Presubmit
@FlakyTest
@Test
fun layerBecomesInvisible() = testSpec.layerBecomesInvisible(splitScreenApp.defaultWindowName)
@@ -87,7 +87,7 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen(
override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
super.visibleLayersShownMoreThanOneConsecutiveEntry()
@Presubmit
@FlakyTest
@Test
fun appWindowBecomesInVisible() =
testSpec.appWindowBecomesInVisible(splitScreenApp.defaultWindowName)

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/OpenAppToLegacySplitScreen.kt
View File

@@ -70,7 +70,7 @@ class OpenAppToLegacySplitScreen(
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
@Presubmit
@FlakyTest
@Test
fun appWindowBecomesVisible() = testSpec.appWindowBecomesVisible(splitScreenApp.getPackage())
@@ -86,7 +86,7 @@ class OpenAppToLegacySplitScreen(
@Test
fun appPairsDividerBecomesVisible() = testSpec.appPairsDividerBecomesVisible()
@Presubmit
@FlakyTest
@Test
fun layerBecomesVisible() = testSpec.layerBecomesVisible(splitScreenApp.getPackage())

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt
View File

@@ -92,7 +92,7 @@ class RotateOneLaunchedAppAndEnterSplitScreen(
@Test
fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
fun appWindowBecomesVisible() =
testSpec.appWindowBecomesVisible(splitScreenApp.defaultWindowName)

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt
View File

@@ -89,7 +89,7 @@ class RotateOneLaunchedAppInSplitScreenMode(
@Test
fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
fun appWindowBecomesVisible() =
testSpec.appWindowBecomesVisible(splitScreenApp.defaultWindowName)

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppInSplitScreenMode.kt
View File

@@ -98,7 +98,7 @@ class RotateTwoLaunchedAppInSplitScreenMode(
testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation,
testSpec.config.endRotation)
@Presubmit
@FlakyTest
@Test
fun appWindowBecomesVisible() =
testSpec.appWindowBecomesVisible(secondaryApp.defaultWindowName)

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

@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
@@ -54,7 +55,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
}
}
@Presubmit
@FlakyTest
@Test
fun pipLayerBecomesVisible() {
testSpec.assertLayers {
@@ -62,7 +63,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
}
}
@Presubmit
@FlakyTest
@Test
fun pipWindowBecomesVisible() {
testSpec.assertWm {

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

@@ -88,6 +88,12 @@ class EnterPipToOtherOrientationTest(
@Test
override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()
@FlakyTest
@Test
override fun noUncoveredRegions() {
super.noUncoveredRegions()
}
@Presubmit
@Test
fun pipAppWindowIsAlwaysOnTop() {

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

@@ -16,11 +16,13 @@
package com.android.wm.shell.flicker.pip
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.dsl.FlickerBuilder
import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
import org.junit.runners.Parameterized
@@ -41,4 +43,16 @@ class PipCloseWithDismissButtonTest(testSpec: FlickerTestParameter) : PipCloseTr
pipApp.closePipWindow(wmHelper)
}
}
@FlakyTest
@Test
override fun pipLayerBecomesInvisible() {
super.pipLayerBecomesInvisible()
}
@FlakyTest
@Test
override fun pipWindowBecomesInvisible() {
super.pipWindowBecomesInvisible()
}
}

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

@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
@@ -67,11 +68,11 @@ class PipCloseWithSwipeTest(testSpec: FlickerTestParameter) : PipCloseTransition
@Test
override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible()
@Presubmit
@FlakyTest
@Test
override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible()

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

@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.FlickerTestParameter
@@ -75,7 +76,7 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec)
override fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation,
testSpec.config.endRotation, allStates = false)
@Presubmit
@FlakyTest
@Test
override fun navBarLayerRotatesAndScales() =
testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation,

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

@@ -16,7 +16,6 @@
package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
@@ -59,7 +58,7 @@ class PipToAppTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
}
}
@Presubmit
@FlakyTest
@Test
fun appReplacesPipWindow() {
testSpec.assertWm {
@@ -69,7 +68,7 @@ class PipToAppTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
}
}
@Presubmit
@FlakyTest
@Test
fun appReplacesPipLayer() {
testSpec.assertLayers {

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

@@ -20,6 +20,7 @@ import android.app.Instrumentation
import android.content.Intent
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.wm.flicker.FlickerBuilderProvider
import com.android.server.wm.flicker.FlickerTestParameter
@@ -167,11 +168,11 @@ abstract class PipTransition(protected val testSpec: FlickerTestParameter) {
@Test
open fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
open fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
open fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()

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

@@ -125,6 +125,12 @@ class SetRequestedOrientationWhilePinnedTest(
}
}
@FlakyTest
@Test
override fun noUncoveredRegions() {
super.noUncoveredRegions()
}
companion object {
@Parameterized.Parameters(name = "{0}")
@JvmStatic

49
tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
View File

@@ -19,19 +19,21 @@ package com.android.server.wm.flicker
import android.platform.helpers.IAppHelper
import com.android.server.wm.flicker.helpers.WindowUtils
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.NAV_BAR_LAYER_NAME
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.NAV_BAR_WINDOW_NAME
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.STATUS_BAR_LAYER_NAME
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper.Companion.STATUS_BAR_WINDOW_NAME
const val WALLPAPER_TITLE = "Wallpaper"
val LAUNCHER_TITLE = arrayOf("Wallpaper", "Launcher", "com.google.android.googlequicksearchbox")
fun FlickerTestParameter.statusBarWindowIsAlwaysVisible() {
assertWm {
this.showsAboveAppWindow(NAV_BAR_LAYER_NAME)
this.showsAboveAppWindow(STATUS_BAR_WINDOW_NAME)
}
}
fun FlickerTestParameter.navBarWindowIsAlwaysVisible() {
assertWm {
this.showsAboveAppWindow(NAV_BAR_LAYER_NAME)
this.showsAboveAppWindow(NAV_BAR_WINDOW_NAME)
}
}
@@ -39,23 +41,23 @@ fun FlickerTestParameter.launcherReplacesAppWindowAsTopWindow(testApp: IAppHelpe
assertWm {
this.showsAppWindowOnTop(testApp.getPackage())
.then()
.showsAppWindowOnTop("Launcher")
.showsAppWindowOnTop(*LAUNCHER_TITLE)
}
}
fun FlickerTestParameter.wallpaperWindowBecomesVisible() {
fun FlickerTestParameter.launcherWindowBecomesVisible() {
assertWm {
this.hidesBelowAppWindow(WALLPAPER_TITLE)
this.hidesBelowAppWindow(*LAUNCHER_TITLE)
.then()
.showsBelowAppWindow(WALLPAPER_TITLE)
.showsBelowAppWindow(*LAUNCHER_TITLE)
}
}
fun FlickerTestParameter.wallpaperWindowBecomesInvisible() {
fun FlickerTestParameter.launcherWindowBecomesInvisible() {
assertWm {
this.showsBelowAppWindow(WALLPAPER_TITLE)
this.showsBelowAppWindow(*LAUNCHER_TITLE)
.then()
.hidesBelowAppWindow(WALLPAPER_TITLE)
.hidesBelowAppWindow(*LAUNCHER_TITLE)
}
}
@@ -130,15 +132,15 @@ fun FlickerTestParameter.navBarLayerIsAlwaysVisible(rotatesScreen: Boolean = fal
fun FlickerTestParameter.statusBarLayerIsAlwaysVisible(rotatesScreen: Boolean = false) {
if (rotatesScreen) {
assertLayers {
this.isVisible(STATUS_BAR_WINDOW_NAME)
this.isVisible(STATUS_BAR_LAYER_NAME)
.then()
.isInvisible(STATUS_BAR_WINDOW_NAME)
.isInvisible(STATUS_BAR_LAYER_NAME)
.then()
.isVisible(STATUS_BAR_WINDOW_NAME)
.isVisible(STATUS_BAR_LAYER_NAME)
}
} else {
assertLayers {
this.isVisible(STATUS_BAR_WINDOW_NAME)
this.isVisible(STATUS_BAR_LAYER_NAME)
}
}
}
@@ -168,34 +170,27 @@ fun FlickerTestParameter.statusBarLayerRotatesScales(
val endingPos = WindowUtils.getStatusBarPosition(endRotation)
assertLayersStart {
this.visibleRegion(STATUS_BAR_WINDOW_NAME).coversExactly(startingPos)
this.visibleRegion(STATUS_BAR_LAYER_NAME).coversExactly(startingPos)
}
assertLayersEnd {
this.visibleRegion(STATUS_BAR_WINDOW_NAME).coversExactly(endingPos)
this.visibleRegion(STATUS_BAR_LAYER_NAME).coversExactly(endingPos)
}
}
fun FlickerTestParameter.appLayerReplacesWallpaperLayer(appName: String) {
fun FlickerTestParameter.appLayerReplacesLauncher(appName: String) {
assertLayers {
this.isVisible(WALLPAPER_TITLE)
this.isVisible(*LAUNCHER_TITLE)
.then()
.isInvisible(WALLPAPER_TITLE)
.isVisible(appName)
}
}
fun FlickerTestParameter.wallpaperLayerReplacesAppLayer(testApp: IAppHelper) {
fun FlickerTestParameter.launcherLayerReplacesApp(testApp: IAppHelper) {
assertLayers {
this.isVisible(testApp.getPackage())
.then()
.isInvisible(testApp.getPackage())
.isVisible(WALLPAPER_TITLE)
}
}
fun FlickerTestParameter.layerAlwaysVisible(packageName: String) {
assertLayers {
this.isVisible(packageName)
.isVisible(*LAUNCHER_TITLE)
}
}

20
tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt
View File

@@ -36,8 +36,8 @@ import com.android.server.wm.flicker.startRotation
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible
import com.android.server.wm.flicker.statusBarLayerRotatesScales
import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer
import com.android.server.wm.flicker.wallpaperWindowBecomesVisible
import com.android.server.wm.flicker.launcherLayerReplacesApp
import com.android.server.wm.flicker.launcherWindowBecomesVisible
import org.junit.Test
abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) {
@@ -76,16 +76,16 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter)
testSpec.statusBarWindowIsAlwaysVisible()
}
@Presubmit
@FlakyTest
@Test
open fun navBarLayerIsAlwaysVisible() {
testSpec.navBarLayerIsAlwaysVisible()
testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
}
@Presubmit
@FlakyTest
@Test
open fun statusBarLayerIsAlwaysVisible() {
testSpec.statusBarLayerIsAlwaysVisible()
testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
}
@FlakyTest
@@ -130,13 +130,13 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter)
@Presubmit
@Test
open fun wallpaperWindowBecomesVisible() {
testSpec.wallpaperWindowBecomesVisible()
open fun launcherWindowBecomesVisible() {
testSpec.launcherWindowBecomesVisible()
}
@Presubmit
@Test
open fun wallpaperLayerReplacesAppLayer() {
testSpec.wallpaperLayerReplacesAppLayer(testApp)
open fun launcherLayerReplacesApp() {
testSpec.launcherLayerReplacesApp(testApp)
}
}

10
tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt
View File

@@ -18,6 +18,7 @@ package com.android.server.wm.flicker.ime
import android.app.Instrumentation
import android.platform.test.annotations.Presubmit
import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import androidx.test.platform.app.InstrumentationRegistry
@@ -64,7 +65,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter
}
}
teardown {
test {
eachRun {
testApp.exit(wmHelper)
}
}
@@ -104,7 +105,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter
@Test
fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation)
@@ -141,7 +142,10 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter
@JvmStatic
fun getParams(): Collection<FlickerTestParameter> {
return FlickerTestParameterFactory.getInstance()
.getConfigNonRotationTests(repetitions = 5)
.getConfigNonRotationTests(repetitions = 5,
supportedNavigationModes = listOf(
WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY)
)
}
}
}

20
tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt
View File

@@ -19,6 +19,7 @@ package com.android.server.wm.flicker.ime
import android.app.Instrumentation
import android.platform.test.annotations.Presubmit
import android.view.Surface
import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import androidx.test.platform.app.InstrumentationRegistry
@@ -65,7 +66,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
}
}
teardown {
test {
eachRun {
testApp.exit(wmHelper)
}
}
@@ -95,24 +96,24 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
}
}
@Presubmit
@FlakyTest
@Test
fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible()
@Presubmit
@FlakyTest
@Test
fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp)
@Presubmit
@FlakyTest
@Test
fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation,
Surface.ROTATION_0)
@Presubmit
@FlakyTest
@Test
fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()
@Presubmit
@FlakyTest
@Test
fun imeAppLayerBecomesInvisible() = testSpec.imeAppLayerBecomesInvisible(testApp)
@@ -132,7 +133,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
@Test
fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()
@@ -150,7 +151,10 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
@JvmStatic
fun getParams(): Collection<FlickerTestParameter> {
return FlickerTestParameterFactory.getInstance()
.getConfigNonRotationTests(repetitions = 5)
.getConfigNonRotationTests(repetitions = 1,
supportedNavigationModes = listOf(
WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY)
)
}
}
}

8
tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt
View File

@@ -76,11 +76,11 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
}
}
@Presubmit
@FlakyTest
@Test
fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()
@@ -106,7 +106,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
@Test
fun statusBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()
@Presubmit
@FlakyTest
@Test
fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation)
@@ -138,7 +138,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)
}
@Presubmit
@FlakyTest
@Test
fun visibleLayersShownMoreThanOneConsecutiveEntry() {
testSpec.assertLayers {

5
tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt
View File

@@ -20,6 +20,7 @@ import android.app.Instrumentation
import android.platform.test.annotations.Presubmit
import android.view.Surface
import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -97,11 +98,11 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) {
}
}
@Presubmit
@FlakyTest
@Test
fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible()
@Presubmit
@FlakyTest
@Test
fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp)

7
tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt
View File

@@ -34,7 +34,6 @@ import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible
import com.android.server.wm.flicker.noUncoveredRegions
import com.android.server.wm.flicker.appWindowAlwaysVisibleOnTop
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.layerAlwaysVisible
import com.android.server.wm.flicker.startRotation
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible
import com.android.server.wm.flicker.statusBarLayerRotatesScales
@@ -113,7 +112,11 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) {
@Presubmit
@Test
fun layerAlwaysVisible() = testSpec.layerAlwaysVisible(testApp.`package`)
fun layerAlwaysVisible() {
testSpec.assertLayers {
this.isVisible(testApp.`package`)
}
}
@Presubmit
@Test

14
tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt
View File

@@ -33,8 +33,8 @@ import com.android.server.wm.flicker.helpers.setRotation
import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible
import com.android.server.wm.flicker.navBarLayerRotatesAndScales
import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible
import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible
import com.android.server.wm.flicker.appLayerReplacesWallpaperLayer
import com.android.server.wm.flicker.launcherWindowBecomesInvisible
import com.android.server.wm.flicker.appLayerReplacesLauncher
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.noUncoveredRegions
import com.android.server.wm.flicker.startRotation
@@ -107,7 +107,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {
@Presubmit
@Test
fun wallpaperWindowBecomesInvisible() = testSpec.wallpaperWindowBecomesInvisible()
fun launcherWindowBecomesInvisible() = testSpec.launcherWindowBecomesInvisible()
@Presubmit
@Test
@@ -138,8 +138,8 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {
@Presubmit
@Test
fun appLayerReplacesWallpaperLayer() =
testSpec.appLayerReplacesWallpaperLayer(testAppComponentName.className)
fun appLayerReplacesLauncher() =
testSpec.appLayerReplacesLauncher(testAppComponentName.className)
@FlakyTest
@Test
@@ -168,9 +168,9 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {
return FlickerTestParameterFactory.getInstance()
.getConfigNonRotationTests(
repetitions = 1,
supportedRotations = listOf(Surface.ROTATION_0),
supportedNavigationModes = listOf(
WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,
WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY
WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY
)
)
}

2
tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt
View File

@@ -19,6 +19,7 @@ package com.android.server.wm.flicker.ime
import android.app.Instrumentation
import android.platform.test.annotations.Presubmit
import android.view.WindowManagerPolicyConstants
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import androidx.test.platform.app.InstrumentationRegistry
@@ -51,6 +52,7 @@ import org.junit.runners.Parameterized
@RunWith(Parameterized::class)
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@FlakyTest
class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestParameter) {
private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
private val testApp = SimpleAppHelper(instrumentation)

3
tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt
View File

@@ -18,10 +18,11 @@ package com.android.server.wm.flicker.launch
import android.platform.helpers.IAppHelper
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.LAUNCHER_TITLE
fun FlickerTestParameter.appWindowReplacesLauncherAsTopWindow(testApp: IAppHelper) {
assertWm {
this.showsAppWindowOnTop("Launcher")
this.showsAppWindowOnTop(*LAUNCHER_TITLE)
.then()
.showsAppWindowOnTop("Snapshot", testApp.getPackage())
}

6
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt
View File

@@ -25,7 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.helpers.reopenAppFromOverview
import com.android.server.wm.flicker.helpers.setRotation
import com.android.server.wm.flicker.startRotation
import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible
import com.android.server.wm.flicker.launcherWindowBecomesInvisible
import com.android.server.wm.flicker.dsl.FlickerBuilder
import org.junit.FixMethodOrder
import org.junit.Test
@@ -70,8 +70,8 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
@Postsubmit
@Test
override fun wallpaperWindowBecomesInvisible() {
testSpec.wallpaperWindowBecomesInvisible()
override fun launcherWindowBecomesInvisible() {
testSpec.launcherWindowBecomesInvisible()
}
@FlakyTest

27
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt
View File

@@ -19,10 +19,11 @@ package com.android.server.wm.flicker.launch
import android.app.Instrumentation
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
import androidx.test.platform.app.InstrumentationRegistry
import com.android.server.wm.flicker.FlickerBuilderProvider
import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.appLayerReplacesWallpaperLayer
import com.android.server.wm.flicker.appLayerReplacesLauncher
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.endRotation
import com.android.server.wm.flicker.focusChanges
@@ -39,7 +40,7 @@ import com.android.server.wm.flicker.startRotation
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible
import com.android.server.wm.flicker.statusBarLayerRotatesScales
import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible
import com.android.server.wm.flicker.launcherWindowBecomesInvisible
import org.junit.Test
abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
@@ -75,13 +76,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
testSpec.navBarWindowIsAlwaysVisible()
}
@Presubmit
@FlakyTest
@Test
open fun navBarLayerIsAlwaysVisible() {
testSpec.navBarLayerIsAlwaysVisible()
testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
}
@Presubmit
@FlakyTest
@Test
open fun navBarLayerRotatesAndScales() {
testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)
@@ -93,10 +94,10 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
testSpec.statusBarWindowIsAlwaysVisible()
}
@Presubmit
@FlakyTest
@Test
open fun statusBarLayerIsAlwaysVisible() {
testSpec.statusBarLayerIsAlwaysVisible()
testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
}
@Presubmit
@@ -134,13 +135,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
testSpec.focusChanges("NexusLauncherActivity", testApp.`package`)
}
@Presubmit
@FlakyTest
@Test
open fun appLayerReplacesWallpaperLayer() {
testSpec.appLayerReplacesWallpaperLayer(testApp.`package`)
open fun appLayerReplacesLauncher() {
testSpec.appLayerReplacesLauncher(testApp.`package`)
}
@Presubmit
@FlakyTest
@Test
open fun appWindowReplacesLauncherAsTopWindow() {
testSpec.appWindowReplacesLauncherAsTopWindow(testApp)
@@ -148,7 +149,7 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
@Presubmit
@Test
open fun wallpaperWindowBecomesInvisible() {
testSpec.wallpaperWindowBecomesInvisible()
open fun launcherWindowBecomesInvisible() {
testSpec.launcherWindowBecomesInvisible()
}
}

13
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt
View File

@@ -16,6 +16,7 @@
package com.android.server.wm.flicker.launch
import android.platform.test.annotations.Presubmit
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -81,6 +82,18 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
super.visibleLayersShownMoreThanOneConsecutiveEntry()
}
@Presubmit
@Test
override fun launcherWindowBecomesInvisible() {
super.launcherWindowBecomesInvisible()
}
@FlakyTest
@Test
override fun noUncoveredRegions() {
super.noUncoveredRegions()
}
companion object {
@Parameterized.Parameters(name = "{0}")
@JvmStatic

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

@@ -16,7 +16,6 @@
package com.android.server.wm.flicker.rotation
import android.platform.test.annotations.Presubmit
import androidx.test.filters.FlakyTest
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -58,7 +57,13 @@ class ChangeAppRotationTest(
super.focusDoesNotChange()
}
@Presubmit
@FlakyTest
@Test
override fun noUncoveredRegions() {
super.noUncoveredRegions()
}
@FlakyTest
@Test
fun screenshotLayerBecomesInvisible() {
testSpec.assertLayers {

20
tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt
View File

@@ -36,6 +36,7 @@ import com.android.server.wm.flicker.startRotation
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible
import com.android.server.wm.flicker.statusBarLayerRotatesScales
import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper
import org.junit.Test
abstract class RotationTransition(protected val testSpec: FlickerTestParameter) {
@@ -68,16 +69,16 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter)
}
}
@Presubmit
@FlakyTest
@Test
open fun navBarWindowIsAlwaysVisible() {
testSpec.navBarWindowIsAlwaysVisible()
}
@Presubmit
@FlakyTest
@Test
open fun navBarLayerIsAlwaysVisible() {
testSpec.navBarLayerIsAlwaysVisible()
testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = true)
}
@FlakyTest
@@ -87,16 +88,16 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter)
testSpec.config.startRotation, testSpec.config.endRotation)
}
@Presubmit
@FlakyTest
@Test
open fun statusBarWindowIsAlwaysVisible() {
testSpec.statusBarWindowIsAlwaysVisible()
}
@Presubmit
@FlakyTest
@Test
open fun statusBarLayerIsAlwaysVisible() {
testSpec.statusBarLayerIsAlwaysVisible()
testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = true)
}
@FlakyTest
@@ -110,7 +111,12 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter)
@Test
open fun visibleLayersShownMoreThanOneConsecutiveEntry() {
testSpec.assertLayers {
this.visibleLayersShownMoreThanOneConsecutiveEntry()
this.visibleLayersShownMoreThanOneConsecutiveEntry(
ignoreLayers = listOf(WindowManagerStateHelper.SPLASH_SCREEN_NAME,
WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME,
"SecondaryHomeHandle"
)
)
}
}

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

@@ -24,7 +24,6 @@ import com.android.server.wm.flicker.FlickerTestParameter
import com.android.server.wm.flicker.FlickerTestParameterFactory
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.flicker.helpers.SeamlessRotationAppHelper
import com.android.server.wm.flicker.layerAlwaysVisible
import com.android.server.wm.flicker.testapp.ActivityOptions
import org.junit.FixMethodOrder
import org.junit.Test
@@ -60,20 +59,28 @@ class SeamlessAppRotationTest(
@FlakyTest(bugId = 140855415)
@Test
override fun navBarLayerRotatesAndScales() {
super.navBarLayerRotatesAndScales()
override fun statusBarWindowIsAlwaysVisible() {
super.statusBarWindowIsAlwaysVisible()
}
@FlakyTest(bugId = 140855415)
@Test
override fun statusBarLayerRotatesScales() {
super.statusBarLayerRotatesScales()
override fun statusBarLayerIsAlwaysVisible() {
super.statusBarLayerIsAlwaysVisible()
}
@FlakyTest
@Test
override fun noUncoveredRegions() {
super.noUncoveredRegions()
}
@Presubmit
@Test
fun appLayerAlwaysVisible() {
testSpec.layerAlwaysVisible(testApp.`package`)
testSpec.assertLayers {
isVisible(testApp.`package`)
}
}
@Presubmit
@@ -81,6 +88,8 @@ class SeamlessAppRotationTest(
fun appLayerRotates() {
testSpec.assertLayers {
this.coversExactly(startingPos, testApp.`package`)
.then()
.coversExactly(endingPos, testApp.`package`)
}
}