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

Commit 885feb49 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Use shell command to clear overview 

Using TAPL to dismiss overview takes up to 30s to run, using the adb command is much faster and should improve test performance, as well as prevent issues with ui automator

Test: atest FlickerTests
Flag: TEST_ONLY
Bug: 407018127
Change-Id: I25f1fb89cb67b672949b8a01f908165c22f5914d
parent c582e387

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

+2 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -48,10 +49,7 @@ abstract class EnterDesktopViaMenuOfLiveOverviewTask : TestScenarioBase() { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Clear all tasks

        val overview = tapl.goHome().switchToOverview()

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        mailApp.open()

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -50,10 +51,7 @@ abstract class EnterDesktopViaMenuOfStaticOverviewTask : TestScenarioBase() { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Clear all tasks

        val overview = tapl.goHome().switchToOverview()

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        mailApp.open()

        tapl.goHome().switchToOverview()

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.wm.shell.scenarios 
import android.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -51,10 +52,7 @@ abstract class EnterDesktopViaStaticDesktopOverviewTask : TestScenarioBase() { 
    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Clear all tasks

        val overview = tapl.goHome().switchToOverview()

        if (overview.hasTasks()) {

            overview.dismissAllTasks()

        }

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        desktopApp.enterDesktopMode(wmHelper, device)

        tapl.goHome().switchToOverview()

    }

libs/WindowManager/Shell/tests/e2e/mediaprojection/scenarios/src/com/android/wm/shell/scenarios/StartAppMediaProjectionFromSplitScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.platform.test.annotations.Postsubmit 
import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -63,7 +64,7 @@ open class StartAppMediaProjectionFromSplitScreen { 


    @Before

    fun setup() {

        tapl.workspace.switchToOverview().dismissAllTasks()

        RemoveAllTasksButHomeRule.removeAllTasksButHome()



        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(initialRotation.value)

libs/WindowManager/Shell/tests/e2e/mediaprojection/scenarios/src/com/android/wm/shell/scenarios/StartAppMediaProjectionInSplitScreen.kt

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.platform.test.annotations.Postsubmit 
import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.flicker.rules.RemoveAllTasksButHomeRule

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -60,7 +61,7 @@ open class StartAppMediaProjectionInSplitScreen { 


    @Before

    fun setup() {

        tapl.workspace.switchToOverview().dismissAllTasks()

        RemoveAllTasksButHomeRule.removeAllTasksButHome()

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(initialRotation.value)

        SplitScreenUtils.enterSplit(wmHelper, tapl, device, targetApp, testApp, initialRotation)