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

Commit 8d4dc014 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Add test for quick switching out of desk. 

- Assert that the desktop app is at top at start.
- Assert that fullscreen app is on top at end.

Fix: 418232738
Test: atest QuickSwitchBetweenDesktopAndFullscreenTest
Flag: EXEMPT adding tests
Change-Id: I7d60d525047c0ce6c1553eeb90b559962c31835f
parent 844faeb4

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

0 → 100644
+88 −0
Original line number Diff line number Diff line 
/*

 * 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.

 * 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.fundamentals



import android.platform.test.annotations.RequiresDevice

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.wm.shell.Utils

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

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

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

import com.android.wm.shell.scenarios.QuickSwitchBetweenDesktopAndFullscreen

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized



/**

 * Test quick switching out of desktop to a fullscreen app.

 *

 * To run this test: atest QuickSwitchBetweenDesktopAndFullscreenTest

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

class QuickSwitchBetweenDesktopAndFullscreenTest(flicker: LegacyFlickerTest) : DesktopModeBaseTest(

    flicker

) {

    inner class QuickSwitchBetweenDesktopAndFullscreenScenario :

        QuickSwitchBetweenDesktopAndFullscreen(

            rotation = flicker.scenario.startRotation

        )



    @Rule

    @JvmField

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

    val scenario = QuickSwitchBetweenDesktopAndFullscreenScenario()

    private val mailApp = scenario.mailApp

    private val testApp = scenario.testApp





    override val transition: FlickerBuilder.() -> Unit

        get() = {

            setup {

                scenario.setup()

            }

            transitions {

                scenario.closeAllAppsInDesktop()

            }

            teardown {

                scenario.teardown()

            }

        }



    @Test

    fun appWindowOnTopAtStart() = flicker.appWindowOnTopAtStart(testApp)



    @Test

    fun appWindowOnTopAtEnd() = flicker.appWindowOnTopAtEnd(mailApp)



    companion object {

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

        @JvmStatic

        fun getParams(): Collection<FlickerTest> {

            return LegacyFlickerTestFactory.nonRotationTests(

                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)

            )

        }

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/fundamentals/QuickSwitchBetweenDesktopAndFullscreenTest.kt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * 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.

 * 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.functional.fundamentals



import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.QuickSwitchBetweenDesktopAndFullscreen

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/* Functional test for [QuickSwitchBetweenDesktopAndFullscreen]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class QuickSwitchBetweenDesktopAndFullscreenTest : QuickSwitchBetweenDesktopAndFullscreen()

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

0 → 100644
+78 −0
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.scenarios



import android.app.Instrumentation

import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

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

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

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

import com.android.wm.shell.Utils

import com.android.wm.shell.shared.desktopmode.DesktopState

import org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.Ignore

import org.junit.Rule

import org.junit.Test



@Ignore("Base Test Class")

abstract class QuickSwitchBetweenDesktopAndFullscreen(

    val navigationMode: NavBar = NavBar.MODE_GESTURAL,

    val rotation: Rotation = Rotation.ROTATION_0

) : TestScenarioBase() {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    val mailApp = DesktopModeAppHelper(MailAppHelper(instrumentation))



    @Rule @JvmField val testSetupRule = Utils.testSetupRule(navigationMode, rotation)



    @Before

    fun setup() {

        Assume.assumeTrue(

            DesktopState.fromContext(instrumentation.context)

                .isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)

        )

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)



        // Set up apps

        mailApp.launchViaIntent(wmHelper)



        testApp.enterDesktopMode(wmHelper, device)

    }



    @Test

    open fun closeAllAppsInDesktop() {

        tapl.getLaunchedAppState().quickSwitchToPreviousApp()

        wmHelper.StateSyncBuilder().withAppTransitionIdle().waitForAndVerify()

    }



    @After

    fun teardown() {

        testApp.exit(wmHelper)

    }

}