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

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

Merge "Promote stable flicker tests (rotation)" into sc-dev am: 9ac4eb34 

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

Change-Id: I3701e5b8187ebe9997ecc1d3370bcfacdcacedc4
parents 3a2de610 9ac4eb34

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+4 −22
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class ChangeAppRotationTest( 
            }

        }



    @FlakyTest(bugId = 151179149)

    @FlakyTest(bugId = 190185577)

    @Test

    override fun focusDoesNotChange() {

        super.focusDoesNotChange()
@@ -63,12 +63,6 @@ class ChangeAppRotationTest( 


    @Postsubmit

    @Test

    override fun noUncoveredRegions() {

        super.noUncoveredRegions()

    }



    @FlakyTest

    @Test

    fun screenshotLayerBecomesInvisible() {

        testSpec.assertLayers {

            this.isVisible(testApp.getPackage())
@@ -81,14 +75,8 @@ class ChangeAppRotationTest( 


    @Postsubmit

    @Test

    override fun appLayerRotates_EndingPos() {

        super.appLayerRotates_EndingPos()

    }



    @Postsubmit

    @Test

    override fun appLayerRotates_StartingPos() {

        super.appLayerRotates_StartingPos()

    override fun statusBarLayerRotatesScales() {

        super.statusBarLayerRotatesScales()

    }



    @Presubmit
@@ -97,18 +85,12 @@ class ChangeAppRotationTest( 
        super.navBarWindowIsAlwaysVisible()

    }



    @Postsubmit

    @FlakyTest

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    }



    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() {

        super.statusBarWindowIsAlwaysVisible()

    }



    companion object {

        private const val SCREENSHOT_LAYER = "RotationLayer"

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt

+4 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) 
            testSpec.config.startRotation, testSpec.config.endRotation)

    }



    @FlakyTest

    @Presubmit

    @Test

    open fun statusBarWindowIsAlwaysVisible() {

        testSpec.statusBarWindowIsAlwaysVisible()
@@ -128,7 +128,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) 
        }

    }



    @FlakyTest

    @Presubmit

    @Test

    open fun noUncoveredRegions() {

        testSpec.noUncoveredRegions(testSpec.config.startRotation,
@@ -141,7 +141,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) 
        testSpec.focusDoesNotChange()

    }



    @FlakyTest

    @Presubmit

    @Test

    open fun appLayerRotates_StartingPos() {

        testSpec.assertLayersStart {
@@ -149,7 +149,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) 
        }

    }



    @FlakyTest

    @Presubmit

    @Test

    open fun appLayerRotates_EndingPos() {

        testSpec.assertLayersEnd {

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+2 −13
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm.flicker.rotation



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -71,13 +72,7 @@ class SeamlessAppRotationTest( 
        super.statusBarLayerIsAlwaysVisible()

    }



    @FlakyTest(bugId = 185400889)

    @Test

    override fun noUncoveredRegions() {

        super.noUncoveredRegions()

    }



    @FlakyTest(bugId = 185400889)

    @Presubmit

    @Test

    fun appLayerAlwaysVisible() {

        testSpec.assertLayers {
@@ -95,12 +90,6 @@ class SeamlessAppRotationTest( 
        }

    }



    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() {

        super.navBarWindowIsAlwaysVisible()

    }



    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {