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

Commit ab1e7b3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable flaky flicker notification tests" into main

parents b6fcc57d 9f266def

tests/FlickerTests/Notification/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationColdTest.kt

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


package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.rule.SettingOverrideRule

import android.provider.Settings

import android.tools.flicker.junit.FlickerParametersRunnerFactory
@@ -26,6 +24,7 @@ import android.tools.flicker.legacy.LegacyFlickerTest 
import android.tools.flicker.legacy.LegacyFlickerTestFactory

import android.tools.helpers.wakeUpAndGoToHomeScreen

import android.tools.traces.component.ComponentNameMatcher

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import org.junit.ClassRule

import org.junit.FixMethodOrder
@@ -46,7 +45,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Postsubmit

@FlakyTest(bugId = 384046002)

open class OpenAppFromLockscreenNotificationColdTest(flicker: LegacyFlickerTest) :

    OpenAppFromNotificationColdTest(flicker) {
@@ -107,12 +106,10 @@ open class OpenAppFromLockscreenNotificationColdTest(flicker: LegacyFlickerTest) 
    override fun navBarWindowIsAlwaysVisible() {}



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        flicker.assertWm {

tests/FlickerTests/Notification/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationWarmTest.kt

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


package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Presubmit

import android.platform.test.rule.SettingOverrideRule

import android.provider.Settings

import android.tools.flicker.junit.FlickerParametersRunnerFactory
@@ -46,6 +45,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FlakyTest(bugId = 384046002)

class OpenAppFromLockscreenNotificationWarmTest(flicker: LegacyFlickerTest) :

    OpenAppFromNotificationWarmTest(flicker) {
@@ -72,7 +72,6 @@ class OpenAppFromLockscreenNotificationWarmTest(flicker: LegacyFlickerTest) : 
     * window of the transition, with snapshot or splash screen windows optionally showing first.

     */

    @Test

    @Presubmit

    fun appWindowBecomesFirstAndOnlyTopWindow() {

        flicker.assertWm {

            this.hasNoVisibleAppWindow()
@@ -87,7 +86,6 @@ class OpenAppFromLockscreenNotificationWarmTest(flicker: LegacyFlickerTest) : 


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

    @Test

    @Presubmit

    fun screenLockedStart() {

        flicker.assertWmStart { isKeyguardShowing() }

    }
@@ -117,7 +115,7 @@ class OpenAppFromLockscreenNotificationWarmTest(flicker: LegacyFlickerTest) : 
     * Checks the position of the [ComponentNameMatcher.STATUS_BAR] at the start and end of the

     * transition

     */

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

    @Test fun statusBarLayerPositionAtEnd() = flicker.statusBarLayerPositionAtEnd()



    /** {@inheritDoc} */

    @Test
@@ -140,7 +138,6 @@ class OpenAppFromLockscreenNotificationWarmTest(flicker: LegacyFlickerTest) : 
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        flicker.assertWm {

tests/FlickerTests/Notification/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationWithOverlayAppTest.kt

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


package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest
@@ -47,7 +45,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Postsubmit

@FlakyTest(bugId = 384046002)

class OpenAppFromLockscreenNotificationWithOverlayAppTest(flicker: LegacyFlickerTest) :

    OpenAppFromLockscreenNotificationColdTest(flicker) {

    private val showWhenLockedApp = ShowWhenLockedAppHelper(instrumentation)
@@ -106,7 +104,7 @@ class OpenAppFromLockscreenNotificationWithOverlayAppTest(flicker: LegacyFlicker 
    }



    /** {@inheritDoc} */

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

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



    /** {@inheritDoc} */

    @FlakyTest(bugId = 227143265)
@@ -120,7 +118,6 @@ class OpenAppFromLockscreenNotificationWithOverlayAppTest(flicker: LegacyFlicker 
    override fun navBarLayerIsVisibleAtStartAndEnd() {}



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()

tests/FlickerTests/Notification/src/com/android/server/wm/flicker/notification/OpenAppFromNotificationColdTest.kt

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


package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import android.tools.helpers.wakeUpAndGoToHomeScreen

import android.tools.traces.component.ComponentNameMatcher

import androidx.test.filters.FlakyTest

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

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

import org.junit.FixMethodOrder
@@ -41,7 +40,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Postsubmit

@FlakyTest(bugId = 384046002)

open class OpenAppFromNotificationColdTest(flicker: LegacyFlickerTest) :

    OpenAppFromNotificationWarmTest(flicker) {

    /** {@inheritDoc} */
@@ -59,9 +58,9 @@ open class OpenAppFromNotificationColdTest(flicker: LegacyFlickerTest) : 
            teardown { testApp.exit(wmHelper) }

        }



    @Presubmit @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_coldStart()

    @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_coldStart()



    @Presubmit @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_coldStart()

    @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_coldStart()



    /** {@inheritDoc} */

    @Test
@@ -83,7 +82,7 @@ open class OpenAppFromNotificationColdTest(flicker: LegacyFlickerTest) : 
     * Checks the position of the [ComponentNameMatcher.STATUS_BAR] at the start and end of the

     * transition

     */

    @Presubmit @Test open fun statusBarLayerPositionAtEnd() = flicker.statusBarLayerPositionAtEnd()

    @Test open fun statusBarLayerPositionAtEnd() = flicker.statusBarLayerPositionAtEnd()



    /** {@inheritDoc} */

    @Test

tests/FlickerTests/Notification/src/com/android/server/wm/flicker/notification/OpenAppFromNotificationWarmTest.kt

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


package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.rule.DisableNotificationCooldownSettingRule

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder
@@ -28,6 +26,7 @@ import android.tools.helpers.wakeUpAndGoToHomeScreen 
import android.tools.traces.component.ComponentNameMatcher

import android.view.WindowInsets

import android.view.WindowManager

import androidx.test.filters.FlakyTest

import androidx.test.uiautomator.By

import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.helpers.NotificationAppHelper
@@ -54,6 +53,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FlakyTest(bugId = 384046002)

open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) :

    OpenAppTransition(flicker) {

    override val testApp: NotificationAppHelper = NotificationAppHelper(instrumentation)
@@ -120,23 +120,20 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) : 
        // Wait for the app to launch

        wmHelper.StateSyncBuilder().withFullScreenApp(testApp).waitForAndVerify()

    }

    @Presubmit @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_warmStart()

    @Test override fun appWindowBecomesVisible() = appWindowBecomesVisible_warmStart()



    @Presubmit @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_warmStart()

    @Test override fun appLayerBecomesVisible() = appLayerBecomesVisible_warmStart()



    @Presubmit

    @Test

    open fun notificationAppWindowVisibleAtEnd() {

        flicker.assertWmEnd { this.isAppWindowVisible(testApp) }

    }



    @Presubmit

    @Test

    open fun notificationAppWindowOnTopAtEnd() {

        flicker.assertWmEnd { this.isAppWindowOnTop(testApp) }

    }



    @Presubmit

    @Test

    open fun notificationAppLayerVisibleAtEnd() {

        flicker.assertLayersEnd { this.isVisible(testApp) }
@@ -148,7 +145,6 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) : 
     *

     * Note: Large screen only

     */

    @Presubmit

    @Test

    open fun taskBarWindowIsVisibleAtEnd() {

        Assume.assumeTrue(usesTaskbar)
@@ -160,7 +156,6 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) : 
     *

     * Note: Large screen only

     */

    @Presubmit

    @Test

    open fun taskBarLayerIsVisibleAtEnd() {

        Assume.assumeTrue(usesTaskbar)
@@ -168,7 +163,6 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) : 
    }



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

    @Presubmit

    @Test

    open fun navBarLayerPositionAtEnd() {

        Assume.assumeFalse(usesTaskbar)
@@ -176,14 +170,12 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) : 
    }



    /** {@inheritDoc} */

    @Presubmit

    @Test

    open fun navBarLayerIsVisibleAtEnd() {

        Assume.assumeFalse(usesTaskbar)

        flicker.navBarLayerIsVisibleAtEnd()

    }



    @Presubmit

    @Test

    open fun navBarWindowIsVisibleAtEnd() {

        Assume.assumeFalse(usesTaskbar)
@@ -197,7 +189,6 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) : 


    /** {@inheritDoc} */

    @Test

    @Postsubmit

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    companion object {