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

Commit c6d9ddf0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable flaky flicker tests" into tm-dev am: 5428fee9 am: 9812c2dc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884331



Change-Id: Ibf23a9c8161b8926b6ccefd915f80869d62b5fbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2f94945 9812c2dc

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

+11 −0
Original line number Diff line number Diff line
@@ -74,6 +74,17 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) 
    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 203538234)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 203538234)

    @Test

    override fun appWindowBecomesTopWindow() = super.appWindowBecomesTopWindow()



    companion object {

        /**

         * Creates the test configurations.

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

+6 −0
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) 
    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 203538234)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.

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

+18 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.platform.test.annotations.Postsubmit 
import android.platform.test.annotations.RequiresDevice

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.launcher3.tapl.LauncherInstrumentation
@@ -29,8 +30,10 @@ 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.helpers.NotificationAppHelper

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

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

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

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -162,6 +165,21 @@ open class OpenAppFromNotificationWarm(testSpec: FlickerTestParameter) 
        }

    }



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowBecomesTopWindow() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        super.appWindowBecomesTopWindow()

    }



    @FlakyTest(bugId = 229738092)

    @Test

    fun appWindowBecomesTopWindow_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        super.appWindowBecomesTopWindow()

    }



    companion object {

        /**

         * Creates the test configurations.