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

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

Promote passing app launch assertions 

Fixes: 213853038
Bug: 203538234
Bug: 229738092
Bug: 229735718
Bug: 246284526
Test: atest FlickerTests
Change-Id: I64454bc5ee172a3b38bc43bc654f264defa97a52
parent 4d05eedd

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt

+0 −6
Original line number Diff line number Diff line
@@ -79,12 +79,6 @@ open class OpenAppColdTest(testSpec: FlickerTestParameter) : 
    /** {@inheritDoc} */

    @Presubmit @Test override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 240238245)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt

+16 −40
Original line number Diff line number Diff line
@@ -18,14 +18,13 @@ package com.android.server.wm.flicker.launch 


import android.platform.test.annotations.FlakyTest

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

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.navBarLayerPositionAtEnd

import com.android.server.wm.flicker.statusBarLayerPositionAtEnd

import org.junit.Assume

import com.android.server.wm.traces.common.ComponentNameMatcher

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test
@@ -65,11 +64,6 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) : 
            }

        }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 203538234)

    @Test
@@ -77,31 +71,30 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) : 
        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 203538234)

    @Test

    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()

    @Test @Ignore("Display is off at the start") override fun navBarLayerPositionAtStartAndEnd() {}



    /** {@inheritDoc} */

    @Test @Ignore("Display is off at the start") override fun navBarLayerPositionAtStartAndEnd() {}

    @Test

    @Ignore("Display is off at the start")

    override fun statusBarLayerPositionAtStartAndEnd() {}



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

    @Postsubmit

    /** {@inheritDoc} */

    @Test

    fun navBarLayerPositionAtEnd() {

        Assume.assumeFalse(testSpec.isTablet)

        testSpec.navBarLayerPositionAtEnd()

    }

    @Ignore("Display is off at the start")

    override fun taskBarLayerIsVisibleAtStartAndEnd() {}



    /** {@inheritDoc} */

    @Test

    @Ignore("Display is off at the start")

    override fun statusBarLayerPositionAtStartAndEnd() {}

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /**

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

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

     * transition

     */

    @Postsubmit @Test fun statusBarLayerPositionEnd() = testSpec.statusBarLayerPositionAtEnd()

    @Presubmit @Test override fun statusBarLayerPositionAtEnd() =

        super.statusBarLayerPositionAtEnd()



    /** {@inheritDoc} */

    @Postsubmit
@@ -109,36 +102,19 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) : 
    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appLayerBecomesVisible() = super.appLayerBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarWindowIsAlwaysVisible() {}



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appWindowIsTopWindowAtEnd() = super.appWindowIsTopWindowAtEnd()



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt

+13 −63
Original line number Diff line number Diff line
@@ -17,19 +17,14 @@ 
package com.android.server.wm.flicker.launch



import android.platform.test.annotations.FlakyTest

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

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.navBarLayerIsVisibleAtEnd

import com.android.server.wm.flicker.navBarLayerPositionAtEnd

import com.android.server.wm.flicker.navBarWindowIsVisibleAtEnd

import com.android.server.wm.flicker.statusBarLayerPositionAtEnd

import com.android.server.wm.traces.common.ComponentNameMatcher

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test
@@ -48,8 +43,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Postsubmit

open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :

class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :

    OpenAppFromNotificationWarm(testSpec) {



    override val openingNotificationsFromLockScreen = true
@@ -74,8 +68,8 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) : 
     * window of the transition, with snapshot or splash screen windows optionally showing first.

     */

    @Test

    @Postsubmit

    open fun appWindowBecomesFirstAndOnlyTopWindow() {

    @Presubmit

    fun appWindowBecomesFirstAndOnlyTopWindow() {

        testSpec.assertWm {

            this.hasNoVisibleAppWindow()

                .then()
@@ -89,96 +83,52 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) : 


    /** Checks that the screen is locked at the start of the transition */

    @Test

    @Postsubmit

    @Presubmit

    fun screenLockedStart() {

        testSpec.assertWmStart { isKeyguardShowing() }

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 203538234)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarLayerPositionAtStartAndEnd() {}



    /** Checks the position of the [ComponentNameMatcher.NAV_BAR] at the end of the transition */

    @Postsubmit

    /** {@inheritDoc} */

    @Test

    fun navBarLayerPositionAtEnd() {

        Assume.assumeFalse(testSpec.isTablet)

        testSpec.navBarLayerPositionAtEnd()

    }

    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")

    override fun statusBarLayerPositionAtStartAndEnd() {}



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")

    override fun statusBarLayerPositionAtStartAndEnd() {}

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /**

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

     * transition

     */

    @Postsubmit @Test fun statusBarLayerPositionEnd() = testSpec.statusBarLayerPositionAtEnd()

    @Presubmit @Test fun statusBarLayerPositionAtEnd() = testSpec.statusBarLayerPositionAtEnd()



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit @Test fun navBarLayerIsVisibleAtEnd() = testSpec.navBarLayerIsVisibleAtEnd()



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    @Postsubmit @Test fun navBarWindowIsVisibleAtEnd() = testSpec.navBarWindowIsVisibleAtEnd()

    override fun navBarWindowIsAlwaysVisible() {}



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appLayerBecomesVisible() = super.appLayerBecomesVisible()

    @FlakyTest @Test override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @FlakyTest(bugId = 246284526)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appWindowIsTopWindowAtEnd() = super.appWindowIsTopWindowAtEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun appWindowBecomesTopWindow_ShellTransit() =

        super.appWindowBecomesTopWindow_ShellTransit()



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt

+6 −5
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.server.wm.flicker.launch



import android.platform.test.annotations.FlakyTest

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -95,12 +95,13 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet 
    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()

    @Presubmit @Test override fun appLayerBecomesVisible() = super.appLayerBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit @Test override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt

+48 −0
Original line number Diff line number Diff line
@@ -17,12 +17,17 @@ 
package com.android.server.wm.flicker.launch



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

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.statusBarLayerPositionAtEnd

import com.android.server.wm.traces.common.ComponentNameMatcher

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized
@@ -49,12 +54,55 @@ open class OpenAppFromNotificationCold(testSpec: FlickerTestParameter) : 
            setup {

                // Close the app that posted the notification to trigger a cold start next time

                // it is open - can't just kill it because that would remove the notification.

                tapl.setExpectedRotationCheckEnabled(false)

                tapl.goHome()

                tapl.workspace.switchToOverview()

                tapl.overview.dismissAllTasks()

            }

        }



    @Postsubmit

    @Test

    override fun appWindowBecomesVisible() = appWindowBecomesVisible_coldStart()



    @Postsubmit

    @Test

    override fun appLayerBecomesVisible() = appLayerBecomesVisible_coldStart()



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarLayerPositionAtStartAndEnd() {}



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")

    override fun statusBarLayerPositionAtStartAndEnd() {}



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /**

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

     * transition

     */

    @Presubmit

    @Test

    open fun statusBarLayerPositionAtEnd() = testSpec.statusBarLayerPositionAtEnd()



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Display starts locked and app is full screen at the end")

    override fun navBarWindowIsAlwaysVisible() {}



    companion object {

        /**

         * Creates the test configurations.