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

Commit 6f76701a authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Skip earlier to run 2x faster 

This CL adds a new test rule to allow a test case to run only on either
extended (or projected) mode devices.
Currently, the assumption check is done at the beginning of each test
case, but as the setup stage of some test rules takes time it’s better
to skip the test before these setups begin.

The averaged run time is improved from 6m10s to 3m5s.

Flag: EXEMPT - test improvement
Bug: 419150275
Bug: 419122560
Test: atest WMShellSmokeTestsDesktopMode

Change-Id: Ie3c06eb8597ac630d6efd6055725da5f77b2d481
parent b738d680

libs/WindowManager/Shell/tests/e2e/desktopmode/smoke/src/com/android/wm/shell/ConnectedDisplayCujSmokeTests.kt

+25 −31
Original line number Diff line number Diff line
@@ -100,19 +100,24 @@ class ConnectedDisplayCujSmokeTests { 
    @get:Rule(order = 0)

    val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule()



    // This rule must have higher priority than other setup-related rules to skip certain tests on

    // the unsupported device as soon as possible.

    @get:Rule(order = 1)

    val screenRecordRule = ScreenRecordRule(/* keepTestLevelRecordingOnSuccess= */ false)

    val desktopDeviceTypeRule = DesktopDeviceTypeRule()



    @get:Rule(order = 2)

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

    val screenRecordRule = ScreenRecordRule(/* keepTestLevelRecordingOnSuccess= */ false)



    @get:Rule(order = 3)

    val connectedDisplayRule = SimulatedConnectedDisplayTestRule()

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



    @get:Rule(order = 4)

    val shadeDisplayGoesAroundTestRule = ShadeDisplayGoesAroundTestRule()

    val connectedDisplayRule = SimulatedConnectedDisplayTestRule()



    @get:Rule(order = 5)

    val shadeDisplayGoesAroundTestRule = ShadeDisplayGoesAroundTestRule()



    @get:Rule(order = 6)

    val desktopMouseRule = DesktopMouseTestRule()



    @Before
@@ -202,24 +207,23 @@ class ConnectedDisplayCujSmokeTests { 
    // Extended: When a device is connected to ext.display, the user can change topology in Settings

    // > Connected devices > Connected Display

    @Test

    @ExtendedOnly

    fun cuj1e() {

        Assume.assumeTrue(canEnterExtended)

        cuj1()

    }



    // Projected: When a device is connected to ext.display, the user can change topology in

    // Settings > Connected devices > Connected Display

    @Test

    @ProjectedOnly

    fun cuj1p() {

        Assume.assumeFalse(canEnterExtended)

        cuj1()

    }



    // Extended: When an ext. display is connected, Taskbar shows on both displays

    @Test

    @ExtendedOnly

    fun cuj2e() {

        Assume.assumeTrue(canEnterExtended)



        val externalDisplayId = connectedDisplayRule.setupTestDisplay()



        assertTaskbarVisible(DEFAULT_DISPLAY)
@@ -229,9 +233,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Extended: When an ext. display is connected, apps can be opened via Taskbar or All Apps on

    // the external monitor and they default to Desktop Windowing mode

    @Test

    @ExtendedOnly

    fun cuj3e() {

        Assume.assumeTrue(canEnterExtended)



        val externalDisplayId = connectedDisplayRule.setupTestDisplay()

        assertTaskbarVisible(externalDisplayId)
@@ -245,9 +248,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Projected: When an ext. display is connected, apps can be opened via Taskbar or All Apps on

    // the external monitor and they default to Desktop Windowing mode

    @Test

    @ProjectedOnly

    fun cuj3p() {

        Assume.assumeFalse(canEnterExtended)



        val externalDisplayId = connectedDisplayRule.setupTestDisplay()

        assertTaskbarVisible(externalDisplayId)
@@ -261,9 +263,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Projected: When a phone / foldable is connected to a display, the phone / foldable state

    // remains unchanged and a blank desktop session starts on the external monitor

    @Test

    @ProjectedOnly

    fun cuj4p() {

        Assume.assumeFalse(canEnterExtended)



        val externalDisplayId = connectedDisplayRule.setupTestDisplay()



        assertTaskbarInvisible(DEFAULT_DISPLAY)
@@ -280,9 +281,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Extended: All apps can be invoked on either display at any time, but will only ever be shown

    // on one

    @Test

    @ExtendedOnly

    fun cuj5e() {

        Assume.assumeTrue(canEnterExtended)



        browserApp.launchViaIntent()

        verifyActivityState(browserApp, WINDOWING_MODE_FULLSCREEN, DEFAULT_DISPLAY, visible = true)

        verifyWindowCount(browserApp, expectedCount = 1)
@@ -298,9 +298,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Projected: All apps can be invoked on either display at any time, but will only ever be shown

    // on one

    @Test

    @ProjectedOnly

    fun cuj5p() {

        Assume.assumeFalse(canEnterExtended)



        launchAppFromAllApps(DEFAULT_DISPLAY, browserApp)

        verifyActivityState(browserApp, WINDOWING_MODE_FULLSCREEN, DEFAULT_DISPLAY, visible = true)

        verifyWindowCount(browserApp, expectedCount = 1)
@@ -342,15 +341,15 @@ class ConnectedDisplayCujSmokeTests { 


    // Extended: All window modes are supported on the connected display, including split screen

    @Test

    @ExtendedOnly

    fun cuj6e() {

        Assume.assumeTrue(canEnterExtended)

        cuj6()

    }



    // Projected: All window modes are supported on the connected display, including split screen

    @Test

    @ProjectedOnly

    fun cuj6p() {

        Assume.assumeFalse(canEnterExtended)

        cuj6()

    }
@@ -358,9 +357,8 @@ class ConnectedDisplayCujSmokeTests { 
    // going to overview in this state will show the desktop view, with any full screen apps as

    // tiles to the left

    @Test

    @ExtendedOnly

    fun cuj7e() {

        Assume.assumeTrue(canEnterExtended)



        // TODO(b/416610249) - Remove assumption of touch-first-by-default.

        // Start an fullscreen app assuming the device is in touch-first mode.

        clockApp.launchViaIntent()
@@ -385,9 +383,8 @@ class ConnectedDisplayCujSmokeTests { 
    // to the desktop session, going to overview in this state will show the desktop view, with any

    // full screen apps as tiles to the left

    @Test

    @ProjectedOnly

    fun cuj7p() {

        Assume.assumeFalse(canEnterExtended)



        // Clear all tasks

        with(tapl.workspace.openOverviewFromRecentsKeyboardShortcut()) {

            if (hasTasks()) {
@@ -434,9 +431,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Extended: Desktop Windows can be dragged across displays using a cursor when external display

    // isn’t in fullscreen

    @Test

    @ExtendedOnly

    fun cuj8e() {

        Assume.assumeTrue(canEnterExtended)



        val externalDisplayId = connectedDisplayRule.setupTestDisplay()

        disableMouseScaling(externalDisplayId)

        assertTaskbarVisible(DEFAULT_DISPLAY)
@@ -470,9 +466,8 @@ class ConnectedDisplayCujSmokeTests { 
    // Projected: If an app is open on a device, and selected on the other display on the taskbar,

    // it is moved across

    @Test

    @ProjectedOnly

    fun cuj9p() {

        Assume.assumeFalse(canEnterExtended)



        browserApp.launchViaIntent()

        verifyActivityState(browserApp, WINDOWING_MODE_FULLSCREEN, DEFAULT_DISPLAY, visible = true)
@@ -504,20 +499,19 @@ class ConnectedDisplayCujSmokeTests { 
    // Extended: Device state should be recoverable when connecting and disconnecting an

    // ext.display (i.e. does not crash)

    @Test

    @ExtendedOnly

    fun cuj10e() {

        Assume.assumeTrue(canEnterExtended)

        cuj10()

    }



    // Projected: Device state should be recoverable when connecting and disconnecting an

    // ext.display (i.e. does not crash)

    @Test

    @ProjectedOnly

    fun cuj10p() {

        Assume.assumeFalse(canEnterExtended)

        cuj10()

    }





    @After

    fun teardown() {

        // TODO(b/419392000) - Remove once [DesktopMouseTestRule] supports dynamic display changes.

libs/WindowManager/Shell/tests/e2e/utils/src/com/android/wm/shell/DesktopDeviceTypeRule.kt

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



import android.app.Instrumentation

import android.os.Build

import android.view.Display.DEFAULT_DISPLAY

import androidx.test.platform.app.InstrumentationRegistry

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

import kotlin.annotation.AnnotationRetention.RUNTIME

import kotlin.annotation.AnnotationTarget.CLASS

import kotlin.annotation.AnnotationTarget.FUNCTION

import org.junit.AssumptionViolatedException

import org.junit.rules.TestRule

import org.junit.runner.Description

import org.junit.runners.model.Statement



/**

 * Rule that allow tests to be executed only on [ProjectedOnly] or [ExtendedOnly].

 */

class DesktopDeviceTypeRule : TestRule {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val context = instrumentation.targetContext

    private val desktopState = DesktopState.fromContext(context)

    private val canEnterExtended = desktopState.isDesktopModeSupportedOnDisplay(DEFAULT_DISPLAY)



    override fun apply(base: Statement, description: Description): Statement {

        val projectedOnly = description.hasAnnotationInClassOrMethod(ProjectedOnly::class.java)

        val extendedOnly = description.hasAnnotationInClassOrMethod(ExtendedOnly::class.java)

        return when {

            projectedOnly && extendedOnly -> throw RuntimeException(

                "Test cannot be annotated with both @ProjectedOnly and @ExtendedOnly")

            projectedOnly && canEnterExtended -> wrongDeviceTypeStatement(

                "Skipping test on ${Build.PRODUCT} as it doesn't support projected mode.")

            extendedOnly && !canEnterExtended -> wrongDeviceTypeStatement(

                "Skipping test on ${Build.PRODUCT} as it doesn't support extended mode.")

            else -> base

        }

    }

}



private fun <T : Annotation> Description.hasAnnotationInClassOrMethod(

    annotationType: Class<T>

): Boolean = (annotations + testClass.annotations).any { annotationType.isInstance(it) }



private fun wrongDeviceTypeStatement(message: String) =

    object : Statement() {

        override fun evaluate() {

            throw AssumptionViolatedException(message)

        }

    }



/** The test will run only on devices that support projected mode. */

@Retention(RUNTIME)

@Target(CLASS, FUNCTION)

annotation class ProjectedOnly



/** The test will run only on devices that support extended mode. */

@Retention(RUNTIME)

@Target(CLASS, FUNCTION)

annotation class ExtendedOnly
 
 No newline at end of file