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

Commit f025a372 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Demote unstable assertions from presubmit" into sc-dev

parents 11b1d125 e3cdc172

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

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


import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -115,7 +116,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
    @Test

    fun imeAppLayerIsAlwaysVisible() = testSpec.imeAppLayerIsAlwaysVisible(testApp)



    @Presubmit

    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales() {

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

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

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

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -115,7 +116,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @Test

    fun imeAppLayerBecomesInvisible() = testSpec.imeAppLayerBecomesInvisible(testApp)



    @Presubmit

    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales() {

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

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

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Instrumentation 
import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -96,7 +97,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @FlakyTest

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {
@@ -140,7 +141,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
    fun appLayerReplacesWallpaperLayer() =

        testSpec.appLayerReplacesWallpaperLayer(testAppComponentName.className)



    @Presubmit

    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales() {

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

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

+1 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
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

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -28,7 +27,6 @@ import com.android.server.wm.flicker.helpers.setRotation 
import com.android.server.wm.flicker.startRotation

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

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

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -76,17 +74,9 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio 
        testSpec.wallpaperWindowBecomesInvisible()

    }



    @Presubmit

    @Test

    override fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        super.navBarLayerRotatesAndScales()

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_flaky() {

        Assume.assumeTrue(testSpec.isRotated)

    override fun navBarLayerRotatesAndScales() {

        super.navBarLayerRotatesAndScales()

    }