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

Commit ebb19268 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Add support for Tablets on bubbles tests 

Moreover, refactor the test to reuse the base test class with general assertions and fix ktlint errors

Bug: 234735502
Test: atest WMShellFlickerTests
Change-Id: I0266f733c4fe19087fbd6cd083fefef7093e99f9
parent e5b727ad

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()

}

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

+68 −0
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 android.platform.test.annotations.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -41,6 +42,7 @@ import org.junit.runners.Parameterized 
@Group4

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



    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

            transitions {
@@ -56,4 +58,70 @@ open class LaunchBubbleScreen(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()

}