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

Commit 8d5f64bf authored by Sergey Pinkevich's avatar Sergey Pinkevich
Browse files

[E2E test] Remove YouTube helper from Desktop Windowing tests 

Bug: 434697892
Flag: EXEMPT no flag needed for e2e tests
Test: running e2e and flicker tests locally using atest command

Change-Id: Ife1d3f84a4a4ba870eb48552fbb70af2e1eebdc5
parent eb6c0b62

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

+6 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.flicker

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



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice
@@ -25,6 +25,7 @@ import android.tools.flicker.FlickerTestFactory 
import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import com.android.wm.shell.Utils

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

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

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

import com.android.wm.shell.flicker.utils.appWindowOnTopAtStart
@@ -61,7 +62,7 @@ class AltTabSwitchToUnminimizeInDesktopModeFlickerTest(flicker: FlickerTest) : 
    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)

    val scenario = AltTabSwitchToUnminimizeInDesktopModeScenario()

    private val clockApp = scenario.clockApp

    private val youtubeApp = scenario.youtubeApp

    private val messagesApp = scenario.messagesApp



    override val transition: FlickerBuilder.() -> Unit

        get() = {
@@ -77,16 +78,16 @@ class AltTabSwitchToUnminimizeInDesktopModeFlickerTest(flicker: FlickerTest) : 
        }



    @Test

    fun appWindowInsideDisplayBoundsAtEnd() = flicker.appWindowInsideDisplayBoundsAtEnd(youtubeApp)

    fun appWindowInsideDisplayBoundsAtEnd() = flicker.appWindowInsideDisplayBoundsAtEnd(messagesApp)



    @Test

    fun appWindowOnTopAtStart() = flicker.appWindowOnTopAtStart(clockApp)



    @Test

    fun appWindowOnTopAtEnd() = flicker.appWindowOnTopAtEnd(youtubeApp)

    fun appWindowOnTopAtEnd() = flicker.appWindowOnTopAtEnd(messagesApp)



    @Test

    fun layerBecomesVisible() = flicker.layerBecomesVisible(youtubeApp)

    fun layerBecomesVisible() = flicker.layerBecomesVisible(messagesApp)



    companion object {

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

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ test_module_config { 
    name: "FunctionalTestsDesktopMode-AltTabSwitchToUnminimizeInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.AltTabSwitchToUnminimizeInDesktopModeTest"],

    include_filters: ["com.android.wm.shell.functional.keyboardshortcuts.AltTabSwitchToUnminimizeInDesktopModeTest"],

}



test_module_config {
@@ -91,7 +91,7 @@ test_module_config { 
    exclude_filters: [

        "com.android.wm.shell.functional.AltTabSwitchInDesktopModeTest",

        "com.android.wm.shell.functional.AltTabSwitchOutDesktopModeTest",

        "com.android.wm.shell.functional.AltTabSwitchToUnminimizeInDesktopModeTest",

        "com.android.wm.shell.functional.keyboardshortcuts.AltTabSwitchToUnminimizeInDesktopModeTest",

        "com.android.wm.shell.functional.ChromeNewTabAtWindowLimitTest",

        "com.android.wm.shell.functional.CloseAllAppsWithAppHeaderExitTest",

        "com.android.wm.shell.functional.DisableDisplayMirroringSwitchTest",

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/AltTabSwitchToUnminimizeInDesktopModeTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/keyboardshortcuts/AltTabSwitchToUnminimizeInDesktopModeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.functional

package com.android.wm.shell.functional.keyboardshortcuts



import android.platform.test.annotations.Presubmit

import android.platform.test.rule.ScreenRecordRule

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

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.app.Instrumentation 
import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.device.apphelpers.ClockAppHelper

import android.tools.device.apphelpers.YouTubeAppHelper

import android.tools.device.apphelpers.MessagingAppHelper

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -49,9 +49,9 @@ abstract class AltTabSwitchToUnminimizeInDesktopMode( 


    val calculatorApp = DesktopModeAppHelper(CalculatorAppHelper(instrumentation))

    val clockApp = DesktopModeAppHelper(ClockAppHelper(instrumentation))

    val youtubeApp = DesktopModeAppHelper(YouTubeAppHelper(instrumentation))

    val messagesApp = DesktopModeAppHelper(MessagingAppHelper(instrumentation))



    private val appsInDesktop = listOf(calculatorApp, clockApp, youtubeApp)

    private val appsInDesktop = listOf(calculatorApp, clockApp, messagesApp)



    @Before

    fun setup() {