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

Commit 2f426237 authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "Allow custom test app for enter and exit desktop tests" into main

parents 008fa711 8f2b62e5

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

0 → 100644
+55 −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.traces.parsers.WindowManagerStateHelper

import android.tools.traces.parsers.toFlickerComponent

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

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

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

import com.android.server.wm.flicker.testapp.ActivityOptions

import org.junit.Ignore



/** Base test class for desktop CUJ with customizable test app. */

@Ignore("Base Test Class")

abstract class DesktopScenarioCustomAppTestBase(

    isResizeable: Boolean = true,

    isLandscapeApp: Boolean = true

) {

    val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    val tapl = LauncherInstrumentation()

    val wmHelper = WindowManagerStateHelper(instrumentation)

    val device = UiDevice.getInstance(instrumentation)

    // TODO(b/363181411): Consolidate in LetterboxAppHelper.

    val testApp = when {

        isResizeable && isLandscapeApp -> SimpleAppHelper(instrumentation)

        isResizeable && !isLandscapeApp -> SimpleAppHelper(

                instrumentation,

                launcherName = ActivityOptions.PortraitOnlyActivity.LABEL,

                component = ActivityOptions.PortraitOnlyActivity.COMPONENT.toFlickerComponent()

            )

        // NonResizeablAppHelper has no fixed orientation.

        !isResizeable && isLandscapeApp -> NonResizeableAppHelper(instrumentation)

        // Opens NonResizeablePortraitActivity.

        else -> LetterboxAppHelper(instrumentation)

    }.let { DesktopModeAppHelper(it) }

}
 
 No newline at end of file

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

+5 −14
Original line number Diff line number Diff line
@@ -17,15 +17,8 @@ 
package com.android.wm.shell.scenarios



import android.platform.test.annotations.Postsubmit

import android.app.Instrumentation

import android.tools.NavBar

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 org.junit.After
@@ -40,13 +33,11 @@ import org.junit.runners.BlockJUnit4ClassRunner 
@Postsubmit

open class EnterDesktopWithDrag

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

constructor(

    val rotation: Rotation = Rotation.ROTATION_0,

    isResizeable: Boolean = true,

    isLandscapeApp: Boolean = true

) : DesktopScenarioCustomAppTestBase(isResizeable, isLandscapeApp) {



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

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

+5 −14
Original line number Diff line number Diff line
@@ -17,15 +17,8 @@ 
package com.android.wm.shell.scenarios



import android.platform.test.annotations.Postsubmit

import android.app.Instrumentation

import android.tools.NavBar

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 org.junit.After
@@ -40,13 +33,11 @@ import org.junit.runners.BlockJUnit4ClassRunner 
@Postsubmit

open class ExitDesktopWithDragToTopDragZone

@JvmOverloads

constructor(val rotation: Rotation = Rotation.ROTATION_0) {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

constructor(

    val rotation: Rotation = Rotation.ROTATION_0,

    isResizeable: Boolean = true,

    isLandscapeApp: Boolean = true

) : DesktopScenarioCustomAppTestBase(isResizeable, isLandscapeApp) {



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