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

Commit 966f9a46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifadc6ac9,Ie6164f63,Ia321d286 into main 

* changes:
  Move maximize test into /maximize subfolder and EnterDesktopWithAppHandleMenuTest into /fundamentals subfolder
  b/418238803 Migrate MaximizeAppViaHeaderMenu to legacy flicker test
  b/418237608 Migrate MaximizeAppDoubleTapAppHeader to legacy flicker test
parents 841d529f f54f7a95

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

+16 −8
Original line number Diff line number Diff line
@@ -51,13 +51,14 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.EnterSplitScreenWithAppHandleMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.MaximizeAppFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.OpenAppFromAllAppsFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.OpenAppFromTaskbarFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.OpenAppsInDesktopModeFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.QuickSwitchBetweenDesktopAndFullscreenTest",

        "com.android.wm.shell.flicker.fundamentals.SwitchFocusBetweenAppsTest",

        "com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest",

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

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

        "com.android.wm.shell.flicker.resizing.ResizeAppToMaximumWindowSizeFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppToMinimumWindowSizeFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppWithCornerResizeFlickerTest",
@@ -127,13 +128,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-MaximizeAppFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.fundamentals.MaximizeAppFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -176,6 +170,20 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppNonResizableFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

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

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

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-MaximizeAppFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest"

    },
@@ -42,6 +39,12 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-SwitchToHomeFromDesktopTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppNonResizableFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest"

    },

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.flicker



import android.tools.Rotation.ROTATION_0

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 com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test

import org.junit.runner.RunWith



/**

 * Maximize app window by double tapping on the app header in portrait mode.

 *

 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */

@RequiresDevice

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppDoubleTapAppHeaderPortrait : MaximizeAppWindow(

    rotation = ROTATION_0,

    trigger = MaximizeDesktopAppTrigger.DOUBLE_TAP_APP_HEADER

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

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

    }

}
 
 No newline at end of file

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.flicker



import android.tools.Rotation.ROTATION_0

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 com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Test

import org.junit.runner.RunWith



/**

 * Maximize app window by tapping on the maximize button within the app header maximize menu.

 *

 * Assert that the app window keeps the same increases in size, filling the vertical and horizontal

 * stable display bounds.

 */

@RequiresDevice

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppViaHeaderMenuPortrait : MaximizeAppWindow(

    rotation = ROTATION_0,

    trigger = MaximizeDesktopAppTrigger.MAXIMIZE_BUTTON_IN_MENU

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

    @Test

    override fun maximizeAppWindow() = super.maximizeAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

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

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppDoubleTapAppHeaderLandscape.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/maximize/MaximizeAppDoubleTapAppHeaderFlickerTest.kt

+91 −0
Original line number Diff line number Diff line
@@ -14,21 +14,26 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.flicker



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

package com.android.wm.shell.flicker.maximize



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.flicker.assertions.FlickerTest

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

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

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

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 com.android.wm.shell.scenarios.MaximizeAppWindow

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized



/**

 * Maximize app window by double tapping on the app header.
@@ -37,19 +42,50 @@ import org.junit.runner.RunWith 
 * stable display bounds.

 */

@RequiresDevice

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MaximizeAppDoubleTapAppHeaderLandscape : MaximizeAppWindow(

    rotation = ROTATION_90,

    trigger = MaximizeDesktopAppTrigger.DOUBLE_TAP_APP_HEADER

) {

    @ExpectedScenarios(["MAXIMIZE_APP"])

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

class MaximizeAppDoubleTapAppHeaderFlickerTest(flicker: LegacyFlickerTest) :

        DesktopModeBaseTest(flicker) {

    inner class MaximizeAppDoubleTapAppHeaderZoneScenario : MaximizeAppWindow(

        rotation = flicker.scenario.startRotation,

        trigger = DesktopModeAppHelper.MaximizeDesktopAppTrigger.DOUBLE_TAP_APP_HEADER

    )



    @Rule

    @JvmField

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

    val scenario = MaximizeAppDoubleTapAppHeaderZoneScenario()

    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<FlickerTest> {

            return LegacyFlickerTestFactory.nonRotationTests(

                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)

            )

        }

    }

}