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

Commit d02e787b authored by CHIA-HSUAN HSU's avatar CHIA-HSUAN HSU Committed by CHIA-HSUAN HSU (xWF)
Browse files

Reinstate ExitImmersiveToDesktopWithKeyboardShortcutFlickerTest taskbar test 

Test: USE_RBE=false atest WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.keyboardshortcuts.ExitImmersiveToDesktopWithKeyboardShortcutFlickerTest -c (http://ab/I61600010434367552)
Flag: EXEMPT reinstate taskbar test
Bug: 437760045
Change-Id: I00e0b2e8b36d63578ee71f80085a18be71a4ecc8
parent 3a3cb5c0

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/keyboardshortcuts/ExitImmersiveToDesktopWithKeyboardShortcutFlickerTest.kt

+4 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd 
import com.android.wm.shell.flicker.utils.layerBecomesVisible

import com.android.wm.shell.flicker.utils.resizeVeilKeepsDecreasingInSize

import com.android.wm.shell.scenarios.ExitImmersiveToDesktopWithKeyboardShortcut

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith
@@ -71,7 +70,7 @@ class ExitImmersiveToDesktopWithKeyboardShortcutFlickerTest( 
    val testSetupRule =

        Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)

    val scenario = ExitImmersiveToDesktopWithKeyboardShortcutScenario()

    private val gameApp = scenario.gameApp

    private val immersiveApp = scenario.immersiveApp

    private val navBarMatcher: IComponentNameMatcher = ComponentNameMatcher.NAV_BAR

    private val statusBarMatcher: IComponentNameMatcher = ComponentNameMatcher.STATUS_BAR
@@ -83,20 +82,19 @@ class ExitImmersiveToDesktopWithKeyboardShortcutFlickerTest( 
        }



    @Test

    fun appWindowOnTopAtEnd() = flicker.appWindowOnTopAtEnd(gameApp)

    fun appWindowOnTopAtEnd() = flicker.appWindowOnTopAtEnd(immersiveApp)



    @Test

    fun appWindowKeepVisible() = flicker.appWindowKeepVisible(gameApp)

    fun appWindowKeepVisible() = flicker.appWindowKeepVisible(immersiveApp)



    @Test

    fun resizeVeilKeepsDecreasingInSize() =

        flicker.resizeVeilKeepsDecreasingInSize(gameApp)

        flicker.resizeVeilKeepsDecreasingInSize(immersiveApp)



    @Test

    fun statusBarLayerBecomesVisible() = flicker.layerBecomesVisible(statusBarMatcher)



    @Test

    @Ignore("TODO: Reinstate this test once b/435359906 is fixed")

    fun taskBarLayerBecomesVisible() = flicker.layerBecomesVisible(navBarMatcher)



    companion object {

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/ExitImmersiveToDesktopWithKeyboardShortcut.kt

+8 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.tools.traces.parsers.WindowManagerStateHelper 
import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

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

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

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

import org.junit.Before

import org.junit.After

import org.junit.Ignore
@@ -40,23 +40,23 @@ abstract class ExitImmersiveToDesktopWithKeyboardShortcut( 
    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val gameAppHelper = GameAppHelper(instrumentation)

    val gameApp = DesktopModeAppHelper(gameAppHelper)

    private val immersiveAppHelper = ImmersiveAppHelper(instrumentation)

    val immersiveApp = DesktopModeAppHelper(immersiveAppHelper)



    @Before

    fun setup(){

        gameAppHelper.launchViaIntent(wmHelper)

        gameApp.enterDesktopModeFromAppHandleMenu(wmHelper, device, true)

        gameApp.enterImmersiveMode(wmHelper, device)

        immersiveAppHelper.launchViaIntent(wmHelper)

        immersiveApp.enterDesktopModeFromAppHandleMenu(wmHelper, device, true)

        immersiveApp.enterImmersiveMode(wmHelper, device)

    }



    @Test

    open fun exitImmersive() {

        gameApp.exitImmersiveToDesktopWithKeyboard(wmHelper)

        immersiveApp.exitImmersiveToDesktopWithKeyboard(wmHelper)

    }



    @After

    fun teardown() {

        gameApp.exit(wmHelper)

        immersiveApp.exit(wmHelper)

    }

}