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

Commit aca9eb24 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Promote stable flicker tests (app launch)" into sc-dev am: 128a9fdb 

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

Change-Id: Iba6e922a5f1f015fc419da363dfc8eeb660225bd
parents b0b66c4d 128a9fdb

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

+20 −3
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FlakyTest(bugId = 185400889)

@Group1

@Group1

class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSpec) {

class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSpec) {

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
@@ -69,6 +68,12 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }

    }





    @FlakyTest

    @Test

    override fun navBarLayerIsAlwaysVisible() {

        super.navBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @FlakyTest

    @Test

    @Test

    override fun navBarLayerRotatesAndScales() {

    override fun navBarLayerRotatesAndScales() {
@@ -77,8 +82,20 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 




    @FlakyTest

    @FlakyTest

    @Test

    @Test

    override fun focusChanges() {

    override fun statusBarLayerIsAlwaysVisible() {

        super.focusChanges()

        super.statusBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    override fun appLayerReplacesLauncher() {

        super.appLayerReplacesLauncher()

    }



    @FlakyTest

    @Test

    override fun appWindowReplacesLauncherAsTopWindow() {

        super.appWindowReplacesLauncherAsTopWindow()

    }

    }





    companion object {

    companion object {

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

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




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

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





import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -26,7 +25,6 @@ import com.android.server.wm.flicker.annotation.Group1 
import com.android.server.wm.flicker.helpers.reopenAppFromOverview

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

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

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

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.launcherWindowBecomesInvisible

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

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

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.Test
@@ -65,15 +63,16 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio 
            }

            }

        }

        }





    @Presubmit

    @FlakyTest

    @Test

    @Test

    override fun appWindowReplacesLauncherAsTopWindow() =

    override fun navBarLayerIsAlwaysVisible() {

        super.appWindowReplacesLauncherAsTopWindow()

        super.navBarLayerIsAlwaysVisible()

    }





    @Presubmit

    @FlakyTest

    @Test

    @Test

    override fun launcherWindowBecomesInvisible() {

    override fun statusBarLayerIsAlwaysVisible() {

        testSpec.launcherWindowBecomesInvisible()

        super.statusBarLayerIsAlwaysVisible()

    }

    }





    @FlakyTest

    @FlakyTest
@@ -94,18 +93,6 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio 
        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }

    }





    @FlakyTest

    @Test

    override fun focusChanges() {

        super.focusChanges()

    }



    @FlakyTest(bugId = 185400889)

    @Test

    override fun noUncoveredRegions() {

        super.noUncoveredRegions()

    }



    companion object {

    companion object {

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

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

        @JvmStatic

        @JvmStatic

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

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

import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

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

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

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -76,13 +75,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { 
        testSpec.navBarWindowIsAlwaysVisible()

        testSpec.navBarWindowIsAlwaysVisible()

    }

    }





    @FlakyTest

    @Presubmit

    @Test

    @Test

    open fun navBarLayerIsAlwaysVisible() {

    open fun navBarLayerIsAlwaysVisible() {

        testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)

        testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)

    }

    }





    @FlakyTest

    @Presubmit

    @Test

    @Test

    open fun navBarLayerRotatesAndScales() {

    open fun navBarLayerRotatesAndScales() {

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

        testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)
@@ -94,7 +93,7 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { 
        testSpec.statusBarWindowIsAlwaysVisible()

        testSpec.statusBarWindowIsAlwaysVisible()

    }

    }





    @FlakyTest

    @Presubmit

    @Test

    @Test

    open fun statusBarLayerIsAlwaysVisible() {

    open fun statusBarLayerIsAlwaysVisible() {

        testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)

        testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
@@ -135,13 +134,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { 
        testSpec.focusChanges("NexusLauncherActivity", testApp.`package`)

        testSpec.focusChanges("NexusLauncherActivity", testApp.`package`)

    }

    }





    @FlakyTest

    @Presubmit

    @Test

    @Test

    open fun appLayerReplacesLauncher() {

    open fun appLayerReplacesLauncher() {

        testSpec.appLayerReplacesLauncher(testApp.`package`)

        testSpec.appLayerReplacesLauncher(testApp.`package`)

    }

    }





    @FlakyTest

    @Presubmit

    @Test

    @Test

    open fun appWindowReplacesLauncherAsTopWindow() {

    open fun appWindowReplacesLauncherAsTopWindow() {

        testSpec.appWindowReplacesLauncherAsTopWindow(testApp)

        testSpec.appWindowReplacesLauncherAsTopWindow(testApp)

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

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




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

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





import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -68,8 +67,8 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 




    @FlakyTest

    @FlakyTest

    @Test

    @Test

    override fun focusChanges() {

    override fun navBarLayerIsAlwaysVisible() {

        super.focusChanges()

        super.navBarLayerIsAlwaysVisible()

    }

    }





    @FlakyTest

    @FlakyTest
@@ -78,24 +77,6 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
        super.navBarLayerRotatesAndScales()

        super.navBarLayerRotatesAndScales()

    }

    }





    @FlakyTest

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    @Presubmit

    @Test

    override fun launcherWindowBecomesInvisible() {

        super.launcherWindowBecomesInvisible()

    }



    @FlakyTest

    @Test

    override fun noUncoveredRegions() {

        super.noUncoveredRegions()

    }



    companion object {

    companion object {

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

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

        @JvmStatic

        @JvmStatic