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

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

Merge "Demote unstable assertions from presubmit" into sc-dev am: a8ca7f3a 

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

Change-Id: Ifd5582db54de61c0059d27675bfceb558035720e
parents 4f01d815 a8ca7f3a

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @FlakyTest

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
        testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0, testSpec.config.endRotation)

    }



    @Presubmit

    @FlakyTest

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

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

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


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
@@ -24,6 +25,7 @@ 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
@@ -56,6 +58,12 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp 
            }

        }



    @FlakyTest

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    companion object {

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

        @JvmStatic

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

+18 −0
Original line number Diff line number Diff line
@@ -80,6 +80,24 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio 
        super.navBarLayerRotatesAndScales()

    }



    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() {

        super.statusBarLayerRotatesScales()

    }



    @FlakyTest

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    @FlakyTest

    @Test

    override fun focusChanges() {

        super.focusChanges()

    }



    companion object {

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

        @JvmStatic

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

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


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

        }



    @FlakyTest

    @Test

    override fun focusChanges() {

        super.focusChanges()

    }



    @FlakyTest

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    companion object {

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

        @JvmStatic