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

Commit 04ee8953 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Disable flaky app launch flicker tests" into tm-dev am:... 

Merge "Merge "Disable flaky app launch flicker tests" into tm-dev am: af84398f am: 885c09d8 am: 2cc18513"
parents 97d10945 be590fc6

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

+7 −0
Original line number Diff line number Diff line
@@ -18,12 +18,14 @@ package com.android.server.wm.flicker.launch 


import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import androidx.test.filters.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 org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized
@@ -67,6 +69,11 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) 
            }

        }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    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
@@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch 


import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import androidx.test.filters.FlakyTest

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

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

import com.android.server.wm.flicker.FlickerTestParameterFactory
@@ -99,6 +100,11 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) 
        }

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    companion object {

        /**

         * Creates the test configurations.

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

+7 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch 


import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import androidx.test.filters.FlakyTest

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

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

import com.android.server.wm.flicker.FlickerTestParameterFactory
@@ -103,6 +104,11 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet 
        }

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    companion object {

        /**

         * Creates the test configurations.
@@ -113,7 +119,7 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet 
        @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/OpenAppFromOverviewTest.kt

+22 −0
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.LAUNCHER_COMPONENT

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

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

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

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

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

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

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -132,6 +134,26 @@ open class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) 
    @Test

    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible_warmStart()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun appWindowReplacesLauncherAsTopWindow() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        super.appWindowReplacesLauncherAsTopWindow()

    }



    @FlakyTest(bugId = 229738092)

    @Test

    fun appWindowReplacesLauncherAsTopWindow_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        super.appWindowReplacesLauncherAsTopWindow()

    }



    companion object {

        /**

         * Creates the test configurations.

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

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ open class OpenAppWarmTest(testSpec: FlickerTestParameter) 
    @Test

    override fun appWindowBecomesVisible() = super.appWindowBecomesVisible_warmStart()



    @FlakyTest(bugId = 229735718)

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    companion object {

        /**

         * Creates the test configurations.