Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb76df4f authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Update nav and status bar visibility checks on flicker 

Previously checked:
  - bar visible -> invisible -> visible again (rotation)
  - bar always visible (non-rotation)

However, these checks were unstable and the animation changed during the release, making the tests hard to maintain.

For now check only that the nav and status bar exist at the end of the transition

Bug: 189804667
Bug: 186115871
Test: atest FlickerTests WMShellFlickerTests
Change-Id: I5e34ae7e1af8bfcab56461617aaac9aa326e75b3
parent 4ecd04e6

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

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ class AppPairsTestCannotPairNonResizeableApps( 


    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    override fun navBarLayerIsVisible() {

        super.navBarLayerIsVisible()

    }



    @Presubmit

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

+2 −2
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 


    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    override fun navBarLayerIsVisible() {

        super.navBarLayerIsVisible()

    }



    companion object {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTransition.kt

+12 −12
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ import com.android.server.wm.flicker.endRotation 
import com.android.server.wm.flicker.helpers.isRotated

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.wm.shell.flicker.helpers.AppPairsHelper

import com.android.wm.shell.flicker.helpers.BaseAppHelper

import com.android.wm.shell.flicker.helpers.MultiWindowHelper.Companion.getDevEnableNonResizableMultiWindow
@@ -154,26 +154,26 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) 


    @FlakyTest(bugId = 186510496)

    @Test

    open fun navBarLayerIsAlwaysVisible() {

        testSpec.navBarLayerIsAlwaysVisible()

    open fun navBarLayerIsVisible() {

        testSpec.navBarLayerIsVisible()

    }



    @Presubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() {

        testSpec.statusBarLayerIsAlwaysVisible()

    open fun statusBarLayerIsVisible() {

        testSpec.statusBarLayerIsVisible()

    }



    @Presubmit

    @Test

    open fun navBarWindowIsAlwaysVisible() {

        testSpec.navBarWindowIsAlwaysVisible()

    open fun navBarWindowIsVisible() {

        testSpec.navBarWindowIsVisible()

    }



    @Presubmit

    @Test

    open fun statusBarWindowIsAlwaysVisible() {

        testSpec.statusBarWindowIsAlwaysVisible()

    open fun statusBarWindowIsVisible() {

        testSpec.statusBarWindowIsVisible()

    }



    @Presubmit

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

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ class RotateTwoLaunchedAppsInAppPairsMode( 


    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    override fun statusBarLayerIsVisible() {

        super.statusBarLayerIsVisible()

    }



    @Presubmit

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

+6 −6
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import com.android.server.wm.flicker.annotation.Group1 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.endRotation

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.wm.shell.flicker.appPairsDividerIsVisible

import com.android.wm.shell.flicker.appPairsPrimaryBoundsIsVisible

import com.android.wm.shell.flicker.appPairsSecondaryBoundsIsVisible
@@ -69,16 +69,16 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( 


    @Presubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()

    override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()



    @Presubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()

    override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()



    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    override fun statusBarLayerIsVisible() {

        super.statusBarLayerIsVisible()

    }



    @Presubmit