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

Commit b4d3a16e authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Demote flaky flicker tests from presubmit"

parents 7aff969d ba142e00

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

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

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

import com.android.wm.shell.flicker.helpers.BaseAppHelper

import org.junit.Assume

import org.junit.Before

import org.junit.runner.RunWith

import org.junit.Test

import org.junit.runners.Parameterized
@@ -59,6 +62,12 @@ class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test 
            }

        }



    @Before

    fun setup() {

        // This test doesn't work in shell transitions because of b/205288792

        Assume.assumeFalse(BaseAppHelper.isShellTransitionsEnabled())

    }



    @Presubmit

    @Test

    fun testAppIsAlwaysVisible() {

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

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

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

import com.android.wm.shell.flicker.helpers.BaseAppHelper

import org.junit.Assume

import org.junit.Before

import org.junit.runner.RunWith

import org.junit.Test

import org.junit.runners.Parameterized
@@ -67,6 +70,12 @@ class MultiBubblesScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test 
            }

        }



    @Before

    fun setup() {

        // This test doesn't work in shell transitions because of b/205288792

        Assume.assumeFalse(BaseAppHelper.isShellTransitionsEnabled())

    }



    @Presubmit

    @Test

    fun testAppIsAlwaysVisible() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ class ExitPipViaExpandButtonClickTest( 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Test

    override fun pipLayerExpands() = super.pipLayerExpands()



    companion object {

        /**

         * Creates the test configurations.

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Test

    override fun pipLayerExpands() = super.pipLayerExpands()



    companion object {

        /**

         * Creates the test configurations.

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 215869110)

    @Test

    override fun focusDoesNotChange() = super.focusDoesNotChange()



    companion object {

        /**

         * Creates the test configurations.