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

Commit 36065a76 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Promote passing app close tests"

parents b3609458 80c2add8

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+0 −24
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group4

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

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

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -84,28 +82,6 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() {

        // This test doesn't work in shell transitions because of b/206753786

        Assume.assumeFalse(isShellTransitionsEnabled)

        super.statusBarLayerPositionAtStartAndEnd()

    }



    @FlakyTest(bugId = 214452854)

    @Test

    fun statusBarLayerPositionAtStartAndEnd_shellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        super.statusBarLayerPositionAtStartAndEnd()

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229762973)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+0 −12
Original line number Diff line number Diff line
@@ -85,18 +85,6 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 229762973)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

        /**

         * Creates the test configurations.