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

Commit 1299ce8b authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Divide split screen tests for IW microbenchmark and flicker" into... 

Merge "Divide split screen tests for IW microbenchmark and flicker" into udc-dev am: 7d8d53c8 am: fb646a05 am: a1824391

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22896919



Change-Id: I35284960fd1072006e76f9a4af92efb58c6b58f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc3d011a a1824391

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseBenchmarkTest.kt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.flicker



import android.app.Instrumentation

import android.tools.device.flicker.junit.FlickerBuilderProvider

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.launcher3.tapl.LauncherInstrumentation



abstract class BaseBenchmarkTest

@JvmOverloads

constructor(

    protected open val flicker: FlickerTest,

    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),

    protected val tapl: LauncherInstrumentation = LauncherInstrumentation()

) {

    /** Specification of the test transition to execute */

    abstract val transition: FlickerBuilder.() -> Unit



    /**

     * Entry point for the test runner. It will use this method to initialize and cache flicker

     * executions

     */

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            setup { flicker.scenario.setIsTablet(tapl.isTablet) }

            transition()

        }

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt

+4 −135
Original line number Diff line number Diff line
@@ -17,24 +17,10 @@ 
package com.android.wm.shell.flicker



import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.tools.common.traces.component.ComponentNameMatcher

import android.tools.device.flicker.junit.FlickerBuilderProvider

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.server.wm.flicker.entireScreenCovered

import com.android.server.wm.flicker.navBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.navBarLayerPositionAtStartAndEnd

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.statusBarLayerPositionAtStartAndEnd

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.taskBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.taskBarWindowIsAlwaysVisible

import org.junit.Assume

import org.junit.Test



/**

 * Base test class containing common assertions for [ComponentNameMatcher.NAV_BAR],
@@ -44,124 +30,7 @@ import org.junit.Test 
abstract class BaseTest

@JvmOverloads

constructor(

    protected val flicker: FlickerTest,

    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),

    protected val tapl: LauncherInstrumentation = LauncherInstrumentation()

) {

    /** Specification of the test transition to execute */

    abstract val transition: FlickerBuilder.() -> Unit



    /**

     * Entry point for the test runner. It will use this method to initialize and cache flicker

     * executions

     */

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            setup { flicker.scenario.setIsTablet(tapl.isTablet) }

            transition()

        }

    }



    /** Checks that all parts of the screen are covered during the transition */

    @Presubmit @Test open fun entireScreenCovered() = flicker.entireScreenCovered()



    /**

     * Checks that the [ComponentNameMatcher.NAV_BAR] layer is visible during the whole transition

     */

    @Presubmit

    @Test

    open fun navBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        flicker.navBarLayerIsVisibleAtStartAndEnd()

    }



    /**

     * Checks the position of the [ComponentNameMatcher.NAV_BAR] at the start and end of the

     * transition

     */

    @Presubmit

    @Test

    open fun navBarLayerPositionAtStartAndEnd() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        flicker.navBarLayerPositionAtStartAndEnd()

    }



    /**

     * Checks that the [ComponentNameMatcher.NAV_BAR] window is visible during the whole transition

     *

     * Note: Phones only

     */

    @Presubmit

    @Test

    open fun navBarWindowIsAlwaysVisible() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        flicker.navBarWindowIsAlwaysVisible()

    }



    /**

     * Checks that the [ComponentNameMatcher.TASK_BAR] layer is visible during the whole transition

     */

    @Presubmit

    @Test

    open fun taskBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        flicker.taskBarLayerIsVisibleAtStartAndEnd()

    }



    /**

     * Checks that the [ComponentNameMatcher.TASK_BAR] window is visible during the whole transition

     *

     * Note: Large screen only

     */

    @Presubmit

    @Test

    open fun taskBarWindowIsAlwaysVisible() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        flicker.taskBarWindowIsAlwaysVisible()

    }



    /**

     * Checks that the [ComponentNameMatcher.STATUS_BAR] layer is visible during the whole

     * transition

     */

    @Presubmit

    @Test

    open fun statusBarLayerIsVisibleAtStartAndEnd() = flicker.statusBarLayerIsVisibleAtStartAndEnd()



    /**

     * Checks the position of the [ComponentNameMatcher.STATUS_BAR] at the start and end of the

     * transition

     */

    @Presubmit

    @Test

    open fun statusBarLayerPositionAtStartAndEnd() = flicker.statusBarLayerPositionAtStartAndEnd()



    /**

     * Checks that the [ComponentNameMatcher.STATUS_BAR] window is visible during the whole

     * transition

     */

    @Presubmit

    @Test

    open fun statusBarWindowIsAlwaysVisible() = flicker.statusBarWindowIsAlwaysVisible()



    /**

     * Checks that all layers that are visible on the trace, are visible for at least 2 consecutive

     * entries.

     */

    @Presubmit

    @Test

    open fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry() }

    }



    /**

     * Checks that all windows that are visible on the trace, are visible for at least 2 consecutive

     * entries.

     */

    @Presubmit

    @Test

    open fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        flicker.assertWm { this.visibleWindowsShownMoreThanOneConsecutiveEntry() }

    }

}
 
    override val flicker: FlickerTest,

    instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation(),

    tapl: LauncherInstrumentation = LauncherInstrumentation()

) : BaseBenchmarkTest(flicker, instrumentation, tapl), ICommonAssertions

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/ICommonAssertions.kt

0 → 100644
+136 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.flicker



import android.platform.test.annotations.Presubmit

import android.tools.common.traces.component.ComponentNameMatcher

import android.tools.device.flicker.legacy.FlickerTest

import com.android.server.wm.flicker.entireScreenCovered

import com.android.server.wm.flicker.navBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.navBarLayerPositionAtStartAndEnd

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.statusBarLayerPositionAtStartAndEnd

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.taskBarLayerIsVisibleAtStartAndEnd

import com.android.server.wm.flicker.taskBarWindowIsAlwaysVisible

import org.junit.Assume

import org.junit.Test



interface ICommonAssertions {

    val flicker: FlickerTest



    /** Checks that all parts of the screen are covered during the transition */

    @Presubmit @Test fun entireScreenCovered() = flicker.entireScreenCovered()



    /**

     * Checks that the [ComponentNameMatcher.NAV_BAR] layer is visible during the whole transition

     */

    @Presubmit

    @Test

    fun navBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        flicker.navBarLayerIsVisibleAtStartAndEnd()

    }



    /**

     * Checks the position of the [ComponentNameMatcher.NAV_BAR] at the start and end of the

     * transition

     */

    @Presubmit

    @Test

    fun navBarLayerPositionAtStartAndEnd() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        flicker.navBarLayerPositionAtStartAndEnd()

    }



    /**

     * Checks that the [ComponentNameMatcher.NAV_BAR] window is visible during the whole transition

     *

     * Note: Phones only

     */

    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() {

        Assume.assumeFalse(flicker.scenario.isTablet)

        flicker.navBarWindowIsAlwaysVisible()

    }



    /**

     * Checks that the [ComponentNameMatcher.TASK_BAR] layer is visible during the whole transition

     */

    @Presubmit

    @Test

    fun taskBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        flicker.taskBarLayerIsVisibleAtStartAndEnd()

    }



    /**

     * Checks that the [ComponentNameMatcher.TASK_BAR] window is visible during the whole transition

     *

     * Note: Large screen only

     */

    @Presubmit

    @Test

    fun taskBarWindowIsAlwaysVisible() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        flicker.taskBarWindowIsAlwaysVisible()

    }



    /**

     * Checks that the [ComponentNameMatcher.STATUS_BAR] layer is visible during the whole

     * transition

     */

    @Presubmit

    @Test

    fun statusBarLayerIsVisibleAtStartAndEnd() = flicker.statusBarLayerIsVisibleAtStartAndEnd()



    /**

     * Checks the position of the [ComponentNameMatcher.STATUS_BAR] at the start and end of the

     * transition

     */

    @Presubmit

    @Test

    fun statusBarLayerPositionAtStartAndEnd() = flicker.statusBarLayerPositionAtStartAndEnd()



    /**

     * Checks that the [ComponentNameMatcher.STATUS_BAR] window is visible during the whole

     * transition

     */

    @Presubmit @Test fun statusBarWindowIsAlwaysVisible() = flicker.statusBarWindowIsAlwaysVisible()



    /**

     * Checks that all layers that are visible on the trace, are visible for at least 2 consecutive

     * entries.

     */

    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry() }

    }



    /**

     * Checks that all windows that are visible on the trace, are visible for at least 2 consecutive

     * entries.

     */

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        flicker.assertWm { this.visibleWindowsShownMoreThanOneConsecutiveEntry() }

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt

+10 −18
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.tools.device.flicker.legacy.FlickerBuilder 
import android.tools.device.flicker.legacy.FlickerTest

import android.tools.device.flicker.legacy.FlickerTestFactory

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.ICommonAssertions

import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd

import com.android.wm.shell.flicker.appWindowIsVisibleAtStart
@@ -34,6 +35,7 @@ import com.android.wm.shell.flicker.layerKeepVisible 
import com.android.wm.shell.flicker.splitAppLayerBoundsKeepVisible

import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd

import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart

import com.android.wm.shell.flicker.splitscreen.benchmark.CopyContentInSplitBenchmark

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -49,29 +51,19 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CopyContentInSplit(flicker: FlickerTest) : SplitScreenBase(flicker) {

    private val textEditApp = SplitScreenUtils.getIme(instrumentation)

    private val MagnifierLayer = ComponentNameMatcher("", "magnifier surface bbq wrapper#")

    private val PopupWindowLayer = ComponentNameMatcher("", "PopupWindow:")



class CopyContentInSplit(override val flicker: FlickerTest) :

    CopyContentInSplitBenchmark(flicker), ICommonAssertions {

    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)

            setup { SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, textEditApp) }

            transitions {

                SplitScreenUtils.copyContentInSplit(

                    instrumentation,

                    device,

                    primaryApp,

                    textEditApp

                )

            }

            defaultSetup(this)

            defaultTeardown(this)

            thisTransition(this)

        }



    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun cujCompleted() {

    override fun cujCompleted() {

        flicker.appWindowIsVisibleAtStart(primaryApp)

        flicker.appWindowIsVisibleAtStart(textEditApp)

        flicker.splitScreenDividerIsVisibleAtStart()
@@ -128,8 +120,8 @@ class CopyContentInSplit(flicker: FlickerTest) : SplitScreenBase(flicker) { 
                        ComponentNameMatcher.SNAPSHOT,

                        ComponentNameMatcher.IME_SNAPSHOT,

                        EdgeExtensionComponentMatcher(),

                        MagnifierLayer,

                        PopupWindowLayer

                        magnifierLayer,

                        popupWindowLayer

                    )

            )

        }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt

+7 −37
Original line number Diff line number Diff line
@@ -17,22 +17,21 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest

import android.tools.device.flicker.legacy.FlickerTestFactory

import android.tools.device.helpers.WindowUtils

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.ICommonAssertions

import com.android.wm.shell.flicker.appWindowBecomesInvisible

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd

import com.android.wm.shell.flicker.layerBecomesInvisible

import com.android.wm.shell.flicker.layerIsVisibleAtEnd

import com.android.wm.shell.flicker.splitAppLayerBoundsBecomesInvisible

import com.android.wm.shell.flicker.splitScreenDismissed

import com.android.wm.shell.flicker.splitScreenDividerBecomesInvisible

import com.android.wm.shell.flicker.splitscreen.benchmark.DismissSplitScreenByDividerBenchmark

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -48,36 +47,15 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class DismissSplitScreenByDivider(flicker: FlickerTest) : SplitScreenBase(flicker) {

class DismissSplitScreenByDivider(override val flicker: FlickerTest) :

    DismissSplitScreenByDividerBenchmark(flicker), ICommonAssertions {



    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)

            setup { SplitScreenUtils.enterSplit(wmHelper, tapl, device, primaryApp, secondaryApp) }

            transitions {

                if (tapl.isTablet) {

                    SplitScreenUtils.dragDividerToDismissSplit(

                        device,

                        wmHelper,

                        dragToRight = false,

                        dragToBottom = true

                    )

                } else {

                    SplitScreenUtils.dragDividerToDismissSplit(

                        device,

                        wmHelper,

                        dragToRight = true,

                        dragToBottom = true

                    )

                }

                wmHelper.StateSyncBuilder().withFullScreenApp(secondaryApp).waitForAndVerify()

            defaultSetup(this)

            defaultTeardown(this)

            thisTransition(this)

        }

        }



    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun cujCompleted() = flicker.splitScreenDismissed(primaryApp, secondaryApp, toHome = false)



    @Presubmit

    @Test
@@ -176,12 +154,4 @@ class DismissSplitScreenByDivider(flicker: FlickerTest) : SplitScreenBase(flicke 
    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests()

        }

    }

}