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

Commit 6c256469 authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Add missing setup-test-rule to rest of Desktop e2e scenarios" into main

parents 0ef7279a ecb8639d

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

+8 −1
Original line number Diff line number Diff line
@@ -18,17 +18,20 @@ package com.android.wm.shell.scenarios 


import android.platform.test.annotations.Postsubmit

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 com.android.launcher3.tapl.LauncherInstrumentation

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

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

import com.android.window.flags.Flags

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

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner
@@ -43,6 +46,10 @@ open class EnterDesktopFromKeyboardShortcut : TestScenarioBase() { 
    private val simpleAppHelper = SimpleAppHelper(instrumentation)

    private val testApp = DesktopModeAppHelper(simpleAppHelper)



    @Rule

    @JvmField

    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)



    @Before

    fun setup() {

        Assume.assumeTrue(

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

+8 −2
Original line number Diff line number Diff line
@@ -17,19 +17,21 @@ 
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.SimpleAppHelper

import com.android.window.flags.Flags

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("Test Base Class")
@@ -41,6 +43,10 @@ abstract class EnterDesktopWithAppHandleMenu : TestScenarioBase() { 
    private val simpleAppHelper = SimpleAppHelper(instrumentation)

    private val testApp = DesktopModeAppHelper(simpleAppHelper)



    @Rule

    @JvmField

    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)



    @Before

    fun setup() {

        Assume.assumeTrue(

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

+8 −2
Original line number Diff line number Diff line
@@ -18,20 +18,22 @@ package com.android.wm.shell.scenarios 


import android.platform.test.annotations.Postsubmit

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

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

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

import com.android.window.flags.Flags

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

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner
@@ -47,6 +49,10 @@ open class EnterDesktopWithAppHandleMenuExistingWindows : TestScenarioBase() { 
    private val newTaskApp = NewTasksAppHelper(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))



    @Rule

    @JvmField

    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)



    @Before

    fun setup() {

        Assume.assumeTrue(

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

+8 −1
Original line number Diff line number Diff line
@@ -18,18 +18,21 @@ package com.android.wm.shell.scenarios 


import android.platform.test.annotations.Postsubmit

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

import com.android.window.flags.Flags

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

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner
@@ -45,6 +48,10 @@ open class ExitDesktopFromKeyboardShortcut : TestScenarioBase() { 
    private val simpleAppHelper = SimpleAppHelper(instrumentation)

    private val testApp = DesktopModeAppHelper(simpleAppHelper)



    @Rule

    @JvmField

    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)



    @Before

    fun setup() {

        Assume.assumeTrue(

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

+8 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK

import android.content.Intent.FLAG_ACTIVITY_NEW_TASK

import android.tools.NavBar

import android.tools.PlatformConsts.DEFAULT_DISPLAY

import android.tools.Rotation

import android.tools.device.apphelpers.BrowserAppHelper

import android.tools.device.apphelpers.StandardAppHelper

import android.tools.traces.parsers.WindowManagerStateHelper
@@ -29,13 +31,14 @@ 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.window.flags.Flags

import com.android.wm.shell.Utils

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

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



/**
@@ -60,6 +63,10 @@ abstract class MinimizeWindowOnAppOpen : TestScenarioBase() { 


    private val maxNum = desktopConfig.maxTaskLimit



    @Rule

    @JvmField

    val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, Rotation.ROTATION_0)



    @Before

    fun setup() {

        Assume.assumeTrue(