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

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

Downgrade flaky assertions to postsubmit 

Some tests are unstable but run on presubmit

Bug: 234735502
Test: atest FlickerTests
Change-Id: I358483db7d501a92d7b9d7a626f0145329f93991
parent 36d92a6f

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

+63 −5
Original line number Diff line number Diff line
@@ -16,14 +16,16 @@ 


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



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.FlakyTest

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.annotation.Group1

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

import com.android.server.wm.flicker.navBarLayerPositionEnd

import com.android.server.wm.flicker.statusBarLayerPositionEnd

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -43,8 +45,8 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group1

@Postsubmit

open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter)

    : OpenAppFromNotificationCold(testSpec) {

open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) :

    OpenAppFromNotificationCold(testSpec) {



    override val openingNotificationsFromLockScreen = true
@@ -85,6 +87,62 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) 
    @Test

    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()



    /**

     * Checks the position of the navigation bar at the start and end of the transition

     *

     * Differently from the normal usage of this assertion, check only the final state of the

     * transition because the display is off at the start and the NavBar is never visible

     */

    @Postsubmit

    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerPositionEnd()



    /**

     * Checks the position of the status bar at the start and end of the transition

     *

     * Differently from the normal usage of this assertion, check only the final state of the

     * transition because the display is off at the start and the NavBar is never visible

     */

    @Postsubmit

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerPositionEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appLayerBecomesVisible() = super.appLayerBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.
@@ -95,7 +153,7 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

            return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance()

            return FlickerTestParameterFactory.getInstance()

                    .getConfigNonRotationTests(repetitions = 3)

        }

    }

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

+68 −5
Original line number Diff line number Diff line
@@ -16,14 +16,16 @@ 


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



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.FlakyTest

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.annotation.Group1

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

import com.android.server.wm.flicker.navBarLayerPositionEnd

import com.android.server.wm.flicker.statusBarLayerPositionEnd

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

import org.junit.FixMethodOrder

import org.junit.Test
@@ -44,8 +46,8 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group1

@Postsubmit

open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter)

    : OpenAppFromNotificationWarm(testSpec) {

open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) :

    OpenAppFromNotificationWarm(testSpec) {



    override val openingNotificationsFromLockScreen = true
@@ -111,6 +113,67 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) 
    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /**

     * Checks the position of the navigation bar at the start and end of the transition

     *

     * Differently from the normal usage of this assertion, check only the final state of the

     * transition because the display is off at the start and the NavBar is never visible

     */

    @Postsubmit

    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerPositionEnd()



    /**

     * Checks the position of the status bar at the start and end of the transition

     *

     * Differently from the normal usage of this assertion, check only the final state of the

     * transition because the display is off at the start and the NavBar is never visible

     */

    @Postsubmit

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerPositionEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appLayerBecomesVisible() = super.appLayerBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.
@@ -121,7 +184,7 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

            return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance()

            return FlickerTestParameterFactory.getInstance()

                    .getConfigNonRotationTests(repetitions = 3)

        }

    }

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

+73 −4
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


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



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.FlakyTest

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

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

import com.android.server.wm.flicker.FlickerTestParameterFactory
@@ -26,6 +26,8 @@ import com.android.server.wm.flicker.annotation.Group1 
import com.android.server.wm.flicker.dsl.FlickerBuilder

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

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

import com.android.server.wm.flicker.navBarLayerPositionEnd

import com.android.server.wm.flicker.statusBarLayerPositionEnd

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

import org.junit.FixMethodOrder

import org.junit.Test
@@ -45,8 +47,8 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group1

@Postsubmit

class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParameter)

    : OpenAppFromLockNotificationCold(testSpec) {

class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParameter) :

    OpenAppFromLockNotificationCold(testSpec) {

    private val showWhenLockedApp: ShowWhenLockedAppHelper =

            ShowWhenLockedAppHelper(instrumentation)
@@ -109,6 +111,73 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet 
    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /**

     * Checks the position of the navigation bar at the start and end of the transition

     *

     * Differently from the normal usage of this assertion, check only the final state of the

     * transition because the display is off at the start and the NavBar is never visible

     */

    @Postsubmit

    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerPositionEnd()



    /**

     * Checks the position of the status bar at the start and end of the transition

     *

     * Differently from the normal usage of this assertion, check only the final state of the

     * transition because the display is off at the start and the NavBar is never visible

     */

    @Postsubmit

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerPositionEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appLayerBecomesVisible() = super.appLayerBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.

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

+30 −4
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


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



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.view.WindowInsets

import android.view.WindowManager

import android.platform.test.annotations.FlakyTest

import androidx.test.uiautomator.By

import androidx.test.uiautomator.Until

import com.android.launcher3.tapl.LauncherInstrumentation
@@ -53,8 +53,8 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group1

@Postsubmit

open class OpenAppFromNotificationWarm(testSpec: FlickerTestParameter)

    : OpenAppTransition(testSpec) {

open class OpenAppFromNotificationWarm(testSpec: FlickerTestParameter) :

    OpenAppTransition(testSpec) {

    protected val taplInstrumentation = LauncherInstrumentation()



    override val testApp: NotificationAppHelper = NotificationAppHelper(instrumentation)
@@ -180,6 +180,32 @@ open class OpenAppFromNotificationWarm(testSpec: FlickerTestParameter) 
        super.appWindowBecomesTopWindow()

    }



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.