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

Commit e6a8a785 authored by Sergey Pinkevich's avatar Sergey Pinkevich Committed by Android (Google) Code Review
Browse files

Merge "[E2E test] Ensure Chrome tab tearing is covered by a minimize animation" into main

parents bce00725 39d9b38d

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

0 → 100644
+29 −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 android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.TabTearingDesktopWindowingLimit

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/* Functional test for [TabTearingDesktopWindowingLimit]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class TabTearingDesktopWindowingLimitTest : TabTearingDesktopWindowingLimit()
 
 No newline at end of file

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

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ package com.android.wm.shell.functional 


import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import com.android.wm.shell.scenarios.TabTearingDragAndDrop

import com.android.wm.shell.scenarios.TabTearing

import org.junit.runner.RunWith

import org.junit.runners.BlockJUnit4ClassRunner



/* Functional test for [TabTearingDragAndDrop]. */

/* Functional test for [TabTearing]. */

@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

class TabTearingDragAndDropTest : TabTearingDragAndDrop()
 
 No newline at end of file
 
class TabTearingTest : TabTearing()
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/TabTearingDragAndDrop.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/TabTearing.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.junit.Rule 
import org.junit.Test



@Ignore("Test Base Class")

abstract class TabTearingDragAndDrop(val rotation: Rotation = Rotation.ROTATION_0) :

abstract class TabTearing(val rotation: Rotation = Rotation.ROTATION_0) :

    TestScenarioBase() {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

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

0 → 100644
+107 −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.app.Instrumentation

import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.BrowserAppHelper

import android.tools.device.apphelpers.CalculatorAppHelper

import android.tools.device.apphelpers.ClockAppHelper

import android.tools.flicker.rules.ChangeDisplayOrientationRule

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

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 TabTearingDesktopWindowingLimit(val rotation: Rotation = Rotation.ROTATION_0) :

    TestScenarioBase() {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val mailAppHelper = MailAppHelper(instrumentation)

    private val mailAppDesktopHelper = DesktopModeAppHelper(mailAppHelper)

    private val calculatorHelper = CalculatorAppHelper(instrumentation)

    private val clockAppHelper = ClockAppHelper()

    private val browserAppHelper = BrowserAppHelper(instrumentation)

    private val browserDesktopAppHelper = DesktopModeAppHelper(browserAppHelper)



    @Rule

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



    @Before

    fun setup() {

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

        tapl.apply {

            setEnableRotation(true)

            setExpectedRotation(rotation.value)

            enableTransientTaskbar(false)

        }

        ChangeDisplayOrientationRule.setRotation(rotation)

        tapl.showTaskbarIfHidden()



        mailAppDesktopHelper.enterDesktopMode(wmHelper, device)

        calculatorHelper.launchViaIntent(wmHelper)

        clockAppHelper.launchViaIntent(wmHelper)

        browserAppHelper.launchViaIntent(wmHelper)

        browserAppHelper.closePopupsIfNeeded(device)

    }



    @Test

    open fun tearTab() {

        browserAppHelper.openThreeDotsMenu()

        browserAppHelper.clickNewTabInMenu()

        browserDesktopAppHelper.dragWindowTopLeftCorner(

            device,

            wmHelper,

            DesktopModeAppHelper.WindowDraggingDirection.CENTER

        )

        browserAppHelper.performTabTearing(

            wmHelper,

            BrowserAppHelper.Companion.TabDraggingDirection.TOP_LEFT

        )

        wmHelper

            .StateSyncBuilder()

            .withWindowSurfaceDisappeared(mailAppHelper.componentMatcher)

            .withTopVisibleApps(browserAppHelper.componentMatcher, browserAppHelper.componentMatcher)

            .waitForAndVerify()

    }



    @After

    fun teardown() {

        // Tab tearing creates a new window. We want to make sure to clear storage (and remove all

        // opened windows) to prevent hitting the Chrome window limit.

        browserAppHelper.clearStorage()

        browserDesktopAppHelper.exit(wmHelper)

        mailAppHelper.exit(wmHelper)

        calculatorHelper.exit(wmHelper)

        clockAppHelper.exit(wmHelper)

    }

}
 
 No newline at end of file