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

Commit 31fe5eec authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I08071058,I9a64a7ab into sc-dev am: 2390b55c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a70b19bda3f259df7f4918e65143c55575d59b0
parents 054ee4eb 2390b55c

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

+110 −6
Original line number Diff line number Diff line
@@ -18,12 +18,116 @@ package com.android.wm.shell.flicker 


import android.graphics.Region

import android.view.Surface

import com.android.server.wm.flicker.dsl.LayersAssertionBuilder

import com.android.server.wm.flicker.dsl.LayersAssertionBuilderLegacy

import com.android.server.wm.flicker.APP_PAIR_SPLIT_DIVIDER

import com.android.server.wm.flicker.DOCKED_STACK_DIVIDER

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

import com.android.server.wm.flicker.traces.layers.getVisibleBounds



@JvmOverloads

fun LayersAssertionBuilder.appPairsDividerIsVisible(bugId: Int = 0) {

    end("appPairsDividerIsVisible", bugId) {

        this.isVisible(APP_PAIR_SPLIT_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.appPairsDividerIsInvisible(bugId: Int = 0) {

    end("appPairsDividerIsInVisible", bugId) {

        this.notExists(APP_PAIR_SPLIT_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.appPairsDividerBecomesVisible(bugId: Int = 0) {

    all("dividerLayerBecomesVisible", bugId) {

        this.hidesLayer(DOCKED_STACK_DIVIDER)

            .then()

            .showsLayer(DOCKED_STACK_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.dockedStackDividerIsVisible(bugId: Int = 0) {

    end("dockedStackDividerIsVisible", bugId) {

        this.isVisible(DOCKED_STACK_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.dockedStackDividerBecomesVisible(bugId: Int = 0) {

    all("dividerLayerBecomesVisible", bugId) {

        this.hidesLayer(DOCKED_STACK_DIVIDER)

            .then()

            .showsLayer(DOCKED_STACK_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.dockedStackDividerBecomesInvisible(bugId: Int = 0) {

    all("dividerLayerBecomesInvisible", bugId) {

        this.showsLayer(DOCKED_STACK_DIVIDER)

            .then()

            .hidesLayer(DOCKED_STACK_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.dockedStackDividerIsInvisible(bugId: Int = 0) {

    end("dockedStackDividerIsInvisible", bugId) {

        this.notExists(DOCKED_STACK_DIVIDER)

    }

}



@JvmOverloads

fun LayersAssertionBuilder.appPairsPrimaryBoundsIsVisible(

    rotation: Int,

    primaryLayerName: String,

    bugId: Int = 0

) {

    end("PrimaryAppBounds", bugId) {

        val dividerRegion = entry.getVisibleBounds(APP_PAIR_SPLIT_DIVIDER)

        this.hasVisibleRegion(primaryLayerName, getPrimaryRegion(dividerRegion, rotation))

    }

}



@JvmOverloads

fun LayersAssertionBuilder.appPairsSecondaryBoundsIsVisible(

    rotation: Int,

    secondaryLayerName: String,

    bugId: Int = 0

) {

    end("SecondaryAppBounds", bugId) {

        val dividerRegion = entry.getVisibleBounds(APP_PAIR_SPLIT_DIVIDER)

        this.hasVisibleRegion(secondaryLayerName, getSecondaryRegion(dividerRegion, rotation))

    }

}



@JvmOverloads

fun LayersAssertionBuilder.dockedStackPrimaryBoundsIsVisible(

    rotation: Int,

    primaryLayerName: String,

    bugId: Int = 0

) {

    end("PrimaryAppBounds", bugId) {

        val dividerRegion = entry.getVisibleBounds(DOCKED_STACK_DIVIDER)

        this.hasVisibleRegion(primaryLayerName, getPrimaryRegion(dividerRegion, rotation))

    }

}



@JvmOverloads

fun LayersAssertionBuilder.dockedStackSecondaryBoundsIsVisible(

    rotation: Int,

    secondaryLayerName: String,

    bugId: Int = 0

) {

    end("SecondaryAppBounds", bugId) {

        val dividerRegion = entry.getVisibleBounds(DOCKED_STACK_DIVIDER)

        this.hasVisibleRegion(secondaryLayerName, getSecondaryRegion(dividerRegion, rotation))

    }

}



@JvmOverloads

fun LayersAssertionBuilderLegacy.appPairsDividerIsVisible(

    bugId: Int = 0,

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

+11 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.apppairs



import android.os.Bundle

import android.platform.test.annotations.Presubmit

import android.os.SystemClock

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry
@@ -40,7 +39,6 @@ import org.junit.runners.Parameterized 
 * Test cold launch app from launcher.

 * To run this test: `atest WMShellFlickerTests:AppPairsTestCannotPairNonResizeableApps`

 */

@Presubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -51,10 +49,9 @@ class AppPairsTestCannotPairNonResizeableApps( 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): List<Array<Any>> {

            val testTag = "testAppPairs_cannotPairNonResizeableApps"

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

                withTestName {

                    buildTestTag(testTag, configuration)

                    buildTestTag(configuration)

                }

                transitions {

                    nonResizeableApp?.launchViaIntent(wmHelper)
@@ -64,21 +61,24 @@ class AppPairsTestCannotPairNonResizeableApps( 
                    SystemClock.sleep(AppPairsHelper.TIMEOUT_MS)

                }

                assertions {

                    presubmit {

                        layersTrace {

                            appPairsDividerIsInvisible()

                        }

                        windowManagerTrace {

                        end("onlyResizeableAppWindowVisible") {

                            val nonResizeableApp = nonResizeableApp

                            require(nonResizeableApp != null) {

                                "Non resizeable app not initialized"

                            }



                            end("onlyResizeableAppWindowVisible") {

                                isVisible(nonResizeableApp.defaultWindowName)

                                isInvisible(primaryApp.defaultWindowName)

                            }

                        }

                    }

                }

            }



            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                transition, testSpec, repetitions = AppPairsHelper.TEST_REPETITIONS)

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

+20 −16
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.apppairs 


import android.os.Bundle

import android.os.SystemClock

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.APP_PAIR_SPLIT_DIVIDER
@@ -38,7 +37,6 @@ import org.junit.runners.Parameterized 
 * Test cold launch app from launcher.

 * To run this test: `atest WMShellFlickerTests:AppPairsTestPairPrimaryAndSecondaryApps`

 */

@Presubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -49,10 +47,9 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): List<Array<Any>> {

            val testTag = "testAppPairs_pairPrimaryAndSecondaryApps"

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

                withTestName {

                    buildTestTag(testTag, configuration)

                    buildTestTag(configuration)

                }

                transitions {

                    // TODO pair apps through normal UX flow
@@ -61,9 +58,21 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
                    SystemClock.sleep(AppPairsHelper.TIMEOUT_MS)

                }

                assertions {

                    presubmit {

                        layersTrace {

                            appPairsDividerIsVisible()

                        end("appsEndingBounds", enabled = false) {

                        }

                        windowManagerTrace {

                            end("bothAppWindowsVisible") {

                                isVisible(primaryApp.defaultWindowName)

                                isVisible(secondaryApp.defaultWindowName)

                            }

                        }

                    }



                    flaky {

                        layersTrace {

                            end("appsEndingBounds") {

                                val dividerRegion = entry.getVisibleBounds(APP_PAIR_SPLIT_DIVIDER)

                                this.hasVisibleRegion(primaryApp.defaultWindowName,

                                    appPairsHelper.getPrimaryBounds(dividerRegion))
@@ -71,11 +80,6 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
                                        appPairsHelper.getSecondaryBounds(dividerRegion))

                            }

                        }

                    windowManagerTrace {

                        end("bothAppWindowsVisible") {

                            isVisible(primaryApp.defaultWindowName)

                            isVisible(secondaryApp.defaultWindowName)

                        }

                    }

                }

            }

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

+23 −19
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.apppairs 


import android.os.Bundle

import android.os.SystemClock

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.APP_PAIR_SPLIT_DIVIDER
@@ -38,7 +37,6 @@ import org.junit.runners.Parameterized 
 * Test cold launch app from launcher.

 * To run this test: `atest WMShellFlickerTests:AppPairsTestUnpairPrimaryAndSecondaryApps`

 */

@Presubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -49,10 +47,9 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): List<Array<Any>> {

            val testTag = "testAppPairs_unpairPrimaryAndSecondaryApps"

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

                withTestName {

                    buildTestTag(testTag, configuration)

                    buildTestTag(configuration)

                }

                setup {

                    executeShellCommand(
@@ -66,25 +63,32 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
                    SystemClock.sleep(AppPairsHelper.TIMEOUT_MS)

                }

                assertions {

                    presubmit {

                        layersTrace {

                            appPairsDividerIsInvisible()

                        start("appsStartingBounds", enabled = false) {

                        }

                        windowManagerTrace {

                            end("bothAppWindowsInvisible") {

                                isInvisible(primaryApp.defaultWindowName)

                                isInvisible(secondaryApp.defaultWindowName)

                            }

                        }

                    }



                    flaky {

                        layersTrace {

                            start("appsStartingBounds") {

                                val dividerRegion = entry.getVisibleBounds(APP_PAIR_SPLIT_DIVIDER)

                                this.hasVisibleRegion(primaryApp.defaultWindowName,

                                    appPairsHelper.getPrimaryBounds(dividerRegion))

                                    .hasVisibleRegion(secondaryApp.defaultWindowName,

                                        appPairsHelper.getSecondaryBounds(dividerRegion))

                            }

                        end("appsEndingBounds", enabled = false) {

                            end("appsEndingBounds") {

                                this.notExists(primaryApp.defaultWindowName)

                                    .notExists(secondaryApp.defaultWindowName)

                            }

                        }

                    windowManagerTrace {

                        end("bothAppWindowsInvisible") {

                            isInvisible(primaryApp.defaultWindowName)

                            isInvisible(secondaryApp.defaultWindowName)

                        }

                    }

                }

            }

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

+22 −19
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.apppairs 


import android.os.Bundle

import android.os.SystemClock

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry
@@ -46,7 +45,6 @@ import org.junit.runners.Parameterized 
 * Test open apps to app pairs and rotate.

 * To run this test: `atest WMShellFlickerTests:RotateTwoLaunchedAppsInAppPairsMode`

 */

@Presubmit

@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -60,7 +58,7 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
        fun getParams(): Collection<Array<Any>> {

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

                withTestName {

                    buildTestTag("testRotateTwoLaunchedAppsInAppPairsMode", configuration)

                    buildTestTag(configuration)

                }

                transitions {

                    executeShellCommand(composePairsCommand(
@@ -69,17 +67,7 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
                    setRotation(configuration.endRotation)

                }

                assertions {

                    layersTrace {

                        navBarLayerRotatesAndScales(Surface.ROTATION_0, configuration.endRotation,

                            enabled = false)

                        statusBarLayerRotatesScales(Surface.ROTATION_0, configuration.endRotation,

                            enabled = false)

                        appPairsDividerIsVisible(enabled = false)

                        appPairsPrimaryBoundsIsVisible(configuration.endRotation,

                            primaryApp.defaultWindowName, bugId = 172776659)

                        appPairsSecondaryBoundsIsVisible(configuration.endRotation,

                            secondaryApp.defaultWindowName, bugId = 172776659)

                    }

                    presubmit {

                        windowManagerTrace {

                            navBarWindowIsAlwaysVisible()

                            statusBarWindowIsAlwaysVisible()
@@ -89,6 +77,21 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
                            }

                        }

                    }



                    flaky {

                        layersTrace {

                            appPairsDividerIsVisible()

                            navBarLayerRotatesAndScales(Surface.ROTATION_0,

                                configuration.endRotation)

                            statusBarLayerRotatesScales(Surface.ROTATION_0,

                                configuration.endRotation)

                            appPairsPrimaryBoundsIsVisible(configuration.endRotation,

                                primaryApp.defaultWindowName, bugId = 172776659)

                            appPairsSecondaryBoundsIsVisible(configuration.endRotation,

                                secondaryApp.defaultWindowName, bugId = 172776659)

                        }

                    }

                }

            }



            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,