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

Commit 405c9d83 authored by Sergey Pinkevich's avatar Sergey Pinkevich
Browse files

Add E2E tests for Desktop Windowing mode CUJs with existing windows 

Bug: 346955351
Test: record perfetto trace while performing desktop windowing mode entering when some windows already exist
Flag: NONE new perfetto instrumentation

Change-Id: I6c00361992592d9fda1903e90e0c92662834cded
parent a1764c81

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

0 → 100644
+27 −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



import android.platform.test.annotations.Postsubmit

import com.android.wm.shell.scenarios.EnterDesktopWithDragExistingWindows

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/* Functional test for [EnterDesktopWithDragExistingWindows]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

class EnterDesktopWithDragExistingWindowsTest : EnterDesktopWithDragExistingWindows()

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

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



import android.platform.test.annotations.Postsubmit

import android.app.Instrumentation

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 org.junit.After

import org.junit.Assume

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

open class EnterDesktopWithAppHandleMenuExistingWindows {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val imeApp = ImeAppHelper(instrumentation)

    private val newTaskApp = NewTasksAppHelper(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))



    @Before

    fun setup() {

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

        testApp.enterDesktopMode(wmHelper, device)

        imeApp.launchViaIntent(wmHelper)

        newTaskApp.launchViaIntent(wmHelper)

        testApp.launchViaIntent(wmHelper)

        testApp.exitDesktopWithDragToTopDragZone(wmHelper, device)

    }



    @Test

    open fun reenterDesktopWithAppHandleMenu() {

        testApp.enterDesktopModeFromAppHandleMenu(wmHelper, device)

    }



    @After

    fun teardown() {

        testApp.exit(wmHelper)

        newTaskApp.exit(wmHelper)

        imeApp.exit(wmHelper)

    }

}
 
 No newline at end of file

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

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



import android.tools.NavBar

import android.tools.Rotation

import android.tools.flicker.rules.ChangeDisplayOrientationRule

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 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")

abstract class EnterDesktopWithDragExistingWindows

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)

    private val imeApp = ImeAppHelper(instrumentation)

    private val newTaskApp = NewTasksAppHelper(instrumentation)



    @Before

    fun setup() {

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

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        ChangeDisplayOrientationRule.setRotation(rotation)

        tapl.enableTransientTaskbar(false)



        testApp.enterDesktopMode(wmHelper, device)

        imeApp.launchViaIntent(wmHelper)

        newTaskApp.launchViaIntent(wmHelper)

        testApp.launchViaIntent(wmHelper)

        testApp.exitDesktopWithDragToTopDragZone(wmHelper, device)

    }



    @Test

    open fun reenterDesktopWithDrag() {

        // By default this method uses drag to desktop

        testApp.enterDesktopMode(wmHelper, device)

    }



    @After

    fun teardown() {

        testApp.exit(wmHelper)

        newTaskApp.exit(wmHelper)

        imeApp.exit(wmHelper)

    }

}
 
 No newline at end of file