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

Commit 4247e14d authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Promote stable app launch tests to presubmit 

These flaky tests have been stable for the past week and can be promoted

Test: atest FlickerTests:com.android.server.wm.flicker.close
Bug: 171049683
Bug: 171049760
Bug: 167521849
Change-Id: I8fb98f3c9a4866bd82e2e39fb90b861719401960
parent 765f55d9

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

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


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



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -64,10 +65,12 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio 
            }

        }



    @Postsubmit

    @Test

    override fun appWindowReplacesLauncherAsTopWindow() =

        super.appWindowReplacesLauncherAsTopWindow()



    @Postsubmit

    @Test

    override fun wallpaperWindowBecomesInvisible() {

        testSpec.wallpaperWindowBecomesInvisible()
@@ -75,58 +78,16 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio 


    @Presubmit

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        Assume.assumeTrue(testSpec.isRotated)

        super.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        Assume.assumeTrue(testSpec.isRotated)

        super.navBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    fun statusBarLayerIsAlwaysVisible_Flaky() {

        Assume.assumeFalse(testSpec.isRotated)

        super.statusBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    fun navBarLayerIsAlwaysVisible_Flaky() {

        Assume.assumeFalse(testSpec.isRotated)

        super.navBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        Assume.assumeFalse(testSpec.isRotated)

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

    }



    @FlakyTest

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()

    }



    @Presubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

    override fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.navBarLayerRotatesAndScales()

    }



    @FlakyTest

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry_Flaky() {

    fun navBarLayerRotatesAndScales_flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.navBarLayerRotatesAndScales()

    }



    companion object {

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

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

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerTestParameter
@@ -41,7 +40,6 @@ import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible 
import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.wallpaperWindowBecomesInvisible

import org.junit.Assume

import org.junit.Test



abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
@@ -86,14 +84,6 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { 
    @Presubmit

    @Test

    open fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }



    @FlakyTest

    @Test

    open fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }
@@ -112,14 +102,6 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { 
    @Presubmit

    @Test

    open fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }



    @FlakyTest

    @Test

    open fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }
@@ -131,7 +113,7 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { 
        }

    }



    @FlakyTest

    @Presubmit

    @Test

    open fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

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

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


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



import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -25,7 +24,6 @@ import com.android.server.wm.flicker.helpers.setRotation 
import com.android.server.wm.flicker.startRotation

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
@@ -63,11 +61,6 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
            }

        }



    @FlakyTest

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic