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

Commit 025241de authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge changes from topic "flicker-tangor" 

* changes:
  Add support for Tablets on pip tests
  Add support for Tablets on split screen tests
  Add support for Tablets on bubbles tests
  Create base test class with general assertions
  Add support for Tablets on rotation tests
  Add support for Tablets on quick switch tests
  Add support for Tablets on app launch tests
  Add support for Tablets on IME tests
  Add support for Tablets on app close tests
  Introduce common test class with general assertions
parents fcea1dd6 a07392d4

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

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

 * Copyright (C) 2022 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 androidx.test.platform.app.InstrumentationRegistry

import com.android.launcher3.tapl.LauncherInstrumentation

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerTestParameter

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

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 com.android.server.wm.traces.common.ComponentMatcher

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import org.junit.Assume



/**

 * Base test class containing common assertions for [ComponentMatcher.NAV_BAR],

 * [ComponentMatcher.TASK_BAR], [ComponentMatcher.STATUS_BAR], and general assertions

 * (layers visible in consecutive states, entire screen covered, etc.)

 */

abstract class BaseTest @JvmOverloads constructor(

    protected val testSpec: FlickerTestParameter,

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

    protected val tapl: LauncherInstrumentation = LauncherInstrumentation()

) {

    init {

        testSpec.setIsTablet(

            WindowManagerStateHelper(instrumentation).currentState.wmState.isTablet

        )

    }



    /**

     * 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 {

                test {

                    testSpec.setIsTablet(wmHelper.currentState.wmState.isTablet)

                }

            }

            transition()

        }

    }



    /**

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

     */

    open fun entireScreenCovered() = testSpec.entireScreenCovered()



    /**

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

     */

    open fun navBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeFalse(testSpec.isTablet)

        testSpec.navBarLayerIsVisibleAtStartAndEnd()

    }



    /**

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

     */

    open fun navBarLayerPositionAtStartAndEnd() {

        Assume.assumeFalse(testSpec.isTablet)

        testSpec.navBarLayerPositionAtStartAndEnd()

    }



    /**

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

     *

     * Note: Phones only

     */

    open fun navBarWindowIsAlwaysVisible() {

        Assume.assumeFalse(testSpec.isTablet)

        testSpec.navBarWindowIsAlwaysVisible()

    }



    /**

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

     */

    open fun taskBarLayerIsVisibleAtStartAndEnd() {

        Assume.assumeTrue(testSpec.isTablet)

        testSpec.taskBarLayerIsVisibleAtStartAndEnd()

    }



    /**

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

     *

     * Note: Large screen only

     */

    open fun taskBarWindowIsAlwaysVisible() {

        Assume.assumeTrue(testSpec.isTablet)

        testSpec.taskBarWindowIsAlwaysVisible()

    }



    /**

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

     */

    open fun statusBarLayerIsVisibleAtStartAndEnd() =

        testSpec.statusBarLayerIsVisibleAtStartAndEnd()



    /**

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

     */

    open fun statusBarLayerPositionAtStartAndEnd() = testSpec.statusBarLayerPositionAtStartAndEnd()



    /**

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

     */

    open fun statusBarWindowIsAlwaysVisible() {

        testSpec.statusBarWindowIsAlwaysVisible()

    }



    /**

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

     * consecutive entries.

     */

    open fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry()

        }

    }



    /**

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

     * consecutive entries.

     */

    open fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry()

        }

    }

}

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

+7 −17
Original line number Diff line number Diff line
@@ -17,41 +17,38 @@ 
package com.android.wm.shell.flicker.bubble



import android.app.INotificationManager

import android.app.Instrumentation

import android.app.NotificationManager

import android.content.Context

import android.os.ServiceManager

import android.view.Surface

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.By

import androidx.test.uiautomator.UiObject2

import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

import com.android.wm.shell.flicker.BaseTest

import com.android.wm.shell.flicker.helpers.LaunchBubbleHelper

import org.junit.runners.Parameterized



/**

 * Base configurations for Bubble flicker tests

 */

abstract class BaseBubbleScreen(protected val testSpec: FlickerTestParameter) {

abstract class BaseBubbleScreen(

    testSpec: FlickerTestParameter

) : BaseTest(testSpec) {



    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    protected val context: Context = instrumentation.context

    protected val testApp = LaunchBubbleHelper(instrumentation)



    protected val notifyManager = INotificationManager.Stub.asInterface(

    private val notifyManager = INotificationManager.Stub.asInterface(

            ServiceManager.getService(Context.NOTIFICATION_SERVICE))



    protected val uid = context.packageManager.getApplicationInfo(

    private val uid = context.packageManager.getApplicationInfo(

            testApp.`package`, 0).uid



    protected abstract val transition: FlickerBuilder.() -> Unit



    @JvmOverloads

    protected open fun buildTransition(

        extraSpec: FlickerBuilder.() -> Unit = {}
@@ -84,13 +81,6 @@ abstract class BaseBubbleScreen(protected val testSpec: FlickerTestParameter) { 
    protected fun Flicker.waitAndGetCancelAllBtn(): UiObject2? = device.wait(Until.findObject(

            By.text("Cancel All Bubble")), FIND_OBJECT_TIMEOUT)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            transition(this)

        }

    }



    companion object {

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

        @JvmStatic

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

+74 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.bubble 


import android.content.Context

import android.graphics.Point

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.util.DisplayMetrics

import android.view.WindowManager
@@ -49,6 +50,7 @@ open class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScree 
    private val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager

    private val displaySize = DisplayMetrics()



    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

            setup {
@@ -58,10 +60,13 @@ open class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScree 
                }

            }

            transitions {

                wm.run { wm.getDefaultDisplay().getMetrics(displaySize) }

                wm.run { wm.defaultDisplay.getMetrics(displaySize) }

                val dist = Point((displaySize.widthPixels / 2), displaySize.heightPixels)

                val showBubble = device.wait(Until.findObject(

                        By.res(SYSTEM_UI_PACKAGE, BUBBLE_RES_NAME)), FIND_OBJECT_TIMEOUT)

                val showBubble = device.wait(

                    Until.findObject(

                        By.res(SYSTEM_UI_PACKAGE, BUBBLE_RES_NAME)

                    ), FIND_OBJECT_TIMEOUT

                )

                showBubble?.run { drag(dist, 1000) } ?: error("Show bubble not found")

            }

        }
@@ -73,4 +78,70 @@ open class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScree 
            this.isVisible(testApp)

        }

    }



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun entireScreenCovered() =

        super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() =

        super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() =

        super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() =

        super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() =

        super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() =

        super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() =

        super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

}

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

+73 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.flicker.bubble



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.uiautomator.By
@@ -44,6 +45,7 @@ import org.junit.runners.Parameterized 
@Group4

open class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

            setup {
@@ -53,8 +55,11 @@ open class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen 
                }

            }

            transitions {

                val showBubble = device.wait(Until.findObject(

                        By.res("com.android.systemui", "bubble_view")), FIND_OBJECT_TIMEOUT)

                val showBubble = device.wait(

                    Until.findObject(

                        By.res("com.android.systemui", "bubble_view")

                    ), FIND_OBJECT_TIMEOUT

                )

                showBubble?.run { showBubble.click() } ?: error("Bubble notify not found")

            }

        }
@@ -66,4 +71,70 @@ open class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen 
            this.isVisible(testApp)

        }

    }



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun entireScreenCovered() =

        super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() =

        super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() =

        super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() =

        super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() =

        super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() =

        super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() =

        super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

}

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

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



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.WindowInsets

import android.view.WindowManager
@@ -47,6 +48,7 @@ import org.junit.runners.Parameterized 
@Group4

class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

            setup {
@@ -67,17 +69,24 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr 
                val metricInsets = wm.currentWindowMetrics.windowInsets

                val insets = metricInsets.getInsetsIgnoringVisibility(

                    WindowInsets.Type.statusBars()

                        or WindowInsets.Type.displayCutout())

                        or WindowInsets.Type.displayCutout()

                )

                device.swipe(100, insets.top + 100, 100, device.displayHeight / 2, 4)

                device.waitForIdle(2000)

                instrumentation.uiAutomation.syncInputTransactions()



                val notification = device.wait(Until.findObject(

                    By.text("BubbleChat")), FIND_OBJECT_TIMEOUT)

                val notification = device.wait(

                    Until.findObject(

                        By.text("BubbleChat")

                    ), FIND_OBJECT_TIMEOUT

                )

                notification?.click() ?: error("Notification not found")

                instrumentation.uiAutomation.syncInputTransactions()

                val showBubble = device.wait(Until.findObject(

                        By.res("com.android.systemui", "bubble_view")), FIND_OBJECT_TIMEOUT)

                val showBubble = device.wait(

                    Until.findObject(

                        By.res("com.android.systemui", "bubble_view")

                    ), FIND_OBJECT_TIMEOUT

                )

                showBubble?.click() ?: error("Bubble notify not found")

                instrumentation.uiAutomation.syncInputTransactions()

                val cancelAllBtn = waitAndGetCancelAllBtn()
@@ -102,4 +111,70 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr 
            this.isVisible(testApp)

        }

    }



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun entireScreenCovered() =

        super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() =

        super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() =

        super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() =

        super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() =

        super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() =

        super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() =

        super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

}