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

Commit c72652b8 authored by CHIA-HSUAN HSU's avatar CHIA-HSUAN HSU
Browse files

b/434552023 Migrate MaximizeAppWithKeyboard to flicker test 

Test: USE_RBE=false atest WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.keyboardshortcuts.MaximizeAppWithKeyboardFlickerTest -c (http://ab/I03100010425122374)
Video: http://recall/-/gn7wnpKlcQPufiGnO87bMG
Flag: EXEMPT migrate flicker test
Bug: 434552023
Change-Id: Ie9e124a5f7c6026d5a06734155d30da2e5f5cdb2
parent 7332fdce

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.SwitchToOverviewFromDesktopFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.EnterDesktopFromKeyboardShortcutFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.ExitDesktopToFullScreenWithKeyboardShortcutFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.MaximizeAppWithKeyboardFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.MinimizeAppsWithKeyboardFlickerTest",

        "com.android.wm.shell.flicker.maximize.ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest",

        "com.android.wm.shell.flicker.maximize.MaximizeAppDoubleTapAppHeaderFlickerTest",
@@ -223,6 +224,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.ExitDesktopToFullScreenWithKeyboardShortcutFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-MaximizeAppWithKeyboardFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.MaximizeAppWithKeyboardFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-MinimizeAppsWithKeyboardFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-ExitDesktopToFullScreenWithKeyboardShortcutFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-MaximizeAppWithKeyboardFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-keyboardshortcuts-MinimizeAppsWithKeyboardFlickerTest"

    },

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

+92 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,21 +14,27 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.flicker

package com.android.wm.shell.flicker.keyboardshortcuts



import android.tools.Rotation.ROTATION_90

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import androidx.test.filters.RequiresDevice

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

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP

import android.tools.NavBar

import android.tools.Rotation

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.FlickerBuilder

import android.tools.flicker.FlickerTest

import android.tools.flicker.FlickerTestFactory

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

import com.android.wm.shell.flicker.DesktopModeBaseTest

import com.android.wm.shell.scenarios.MaximizeAppWindow

import com.android.wm.shell.Utils

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

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

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

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized



/**

 * Maximize app window by pressing META + = on the keyboard.
@@ -36,21 +42,51 @@ import org.junit.runner.RunWith 
 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */



@RequiresDevice

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppWithKeyboard : MaximizeAppWindow(

    rotation = ROTATION_90,

    trigger = MaximizeDesktopAppTrigger.KEYBOARD_SHORTCUT

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

class MaximizeAppWithKeyboardFlickerTest(flicker: FlickerTest) : DesktopModeBaseTest(flicker) {

    inner class MaximizeAppWithKeyboardScenario : MaximizeAppWindow(

        rotation = Rotation.ROTATION_90,

        trigger = DesktopModeAppHelper.MaximizeDesktopAppTrigger.KEYBOARD_SHORTCUT

    )



    @Rule

    @JvmField

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

    val scenario = MaximizeAppWithKeyboardScenario()

    private val testApp = scenario.testApp



    override val transition: FlickerBuilder.() -> Unit

        get() = {

            setup {

                scenario.setup()

            }

            transitions {

                scenario.maximizeAppWindow()

            }

            teardown {

                scenario.teardown()

            }

        }



    @Test

    fun appLayerHasMaxDisplayHeightAtEnd() = flicker.appLayerHasMaxDisplayHeightAtEnd(testApp)



    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()

    fun appLayerHasMaxDisplayWidthAtEnd() = flicker.appLayerHasMaxDisplayWidthAtEnd(testApp)



    @Test

    fun resizeVeilKeepsIncreasingInSize() = flicker.resizeVeilKeepsIncreasingInSize(testApp)



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)

        fun getParams(): Collection<FlickerChecker> {

            return FlickerTestFactory.nonRotationTests(

                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)

            )

        }

    }

}