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

Commit 4030ff71 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Update flicker tests using nav bar / task bar conditions 

Bug: 359039833
Test: presubmit
Flag: com.android.wm.shell.enable_taskbar_on_phones
Change-Id: I36650d6c4e8efcb111333edd7402da97b773c6a7
parent ebf8e0c8

libs/WindowManager/Shell/tests/flicker/pip/src/com/android/wm/shell/flicker/pip/ClosePipBySwipingDownTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.tools.flicker.junit.FlickerParametersRunnerFactory 
import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.traces.component.ComponentNameMatcher

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.pip.common.ClosePipTransition

import org.junit.FixMethodOrder

import org.junit.Test
@@ -60,7 +61,7 @@ class ClosePipBySwipingDownTest(flicker: LegacyFlickerTest) : ClosePipTransition 
            val pipCenterY = pipRegion.centerY()

            val displayCenterX = device.displayWidth / 2

            val barComponent =

                if (flicker.scenario.isTablet) {

                if (flicker.scenario.isTablet || Flags.enableTaskbarOnPhones()) {

                    ComponentNameMatcher.TASK_BAR

                } else {

                    ComponentNameMatcher.NAV_BAR

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/ICommonAssertions.kt

+9 −5
Original line number Diff line number Diff line
@@ -28,12 +28,16 @@ import com.android.server.wm.flicker.statusBarLayerPositionAtStartAndEnd 
import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.taskBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.taskBarWindowIsAlwaysVisible

import com.android.wm.shell.Flags

import org.junit.Assume

import org.junit.Test



interface ICommonAssertions {

    val flicker: LegacyFlickerTest



    val usesTaskbar: Boolean

        get() = flicker.scenario.isTablet || Flags.enableTaskbarOnPhones()



    /** Checks that all parts of the screen are covered during the transition */

    @Presubmit @Test fun entireScreenCovered() = flicker.entireScreenCovered()
@@ -43,7 +47,7 @@ interface ICommonAssertions { 
    @Presubmit

    @Test

    fun navBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        Assume.assumeFalse(usesTaskbar)

        flicker.navBarLayerIsVisibleAtStartAndEnd()

    }
@@ -54,7 +58,7 @@ interface ICommonAssertions { 
    @Presubmit

    @Test

    fun navBarLayerPositionAtStartAndEnd() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        Assume.assumeFalse(usesTaskbar)

        flicker.navBarLayerPositionAtStartAndEnd()

    }
@@ -66,7 +70,7 @@ interface ICommonAssertions { 
    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        Assume.assumeFalse(usesTaskbar)

        flicker.navBarWindowIsAlwaysVisible()

    }
@@ -76,7 +80,7 @@ interface ICommonAssertions { 
    @Presubmit

    @Test

    fun taskBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        Assume.assumeTrue(usesTaskbar)

        flicker.taskBarLayerIsVisibleAtStartAndEnd()

    }
@@ -88,7 +92,7 @@ interface ICommonAssertions { 
    @Presubmit

    @Test

    fun taskBarWindowIsAlwaysVisible() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        Assume.assumeTrue(usesTaskbar)

        flicker.taskBarWindowIsAlwaysVisible()

    }