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

Commit 8775b0fe authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Promote stable Flicker tests"

parents 37f08f0f e4db4e55

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt

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


package com.android.server.wm.flicker.quickswitch



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.view.Surface
@@ -266,7 +265,7 @@ open class QuickSwitchBetweenTwoAppsBackTest( 
    }



    /** {@inheritDoc} */

    @Postsubmit

    @Presubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest_ShellTransit.kt

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


package com.android.server.wm.flicker.quickswitch



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -57,29 +56,6 @@ open class QuickSwitchBetweenTwoAppsBackTest_ShellTransit( 
        Assume.assumeTrue(isShellTransitionsEnabled)

    }



    @FlakyTest(bugId = 228009808)

    @Test

    override fun app1LayerIsVisibleOnceApp2LayerIsInvisible() =

        super.app1LayerIsVisibleOnceApp2LayerIsInvisible()



    @FlakyTest(bugId = 228009808)

    @Test

    override fun app1WindowBecomesAndStaysVisible() = super.app1WindowBecomesAndStaysVisible()



    @FlakyTest(bugId = 228009808)

    @Test

    override fun endsWithApp1BeingOnTop() = super.endsWithApp1BeingOnTop()



    @FlakyTest(bugId = 239147075)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 239147075)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Ignore("Nav bar window becomes invisible during quick switch")

    @Test

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt

+1 −15
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.server.wm.flicker.quickswitch



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.view.Surface
@@ -274,22 +272,10 @@ open class QuickSwitchBetweenTwoAppsForwardTest( 
    }



    /** {@inheritDoc} */

    @Postsubmit

    @Presubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 239148258)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 239148258)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

        private var startDisplayBounds = Rect.EMPTY

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest_ShellTransit.kt

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


package com.android.server.wm.flicker.quickswitch



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -57,19 +56,6 @@ open class QuickSwitchBetweenTwoAppsForwardTest_ShellTransit( 
        Assume.assumeTrue(isShellTransitionsEnabled)

    }



    @FlakyTest(bugId = 228009808)

    @Test

    override fun app2LayerIsVisibleOnceApp1LayerIsInvisible() =

        super.app2LayerIsVisibleOnceApp1LayerIsInvisible()



    @FlakyTest(bugId = 228009808)

    @Test

    override fun app2WindowBecomesAndStaysVisible() = super.app2WindowBecomesAndStaysVisible()



    @FlakyTest(bugId = 228009808)

    @Test

    override fun endsWithApp2BeingOnTop() = super.endsWithApp2BeingOnTop()



    /** {@inheritDoc} */

    @Ignore("Nav bar window becomes invisible during quick switch")

    @Test

tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt

+1 −14
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.server.wm.flicker.quickswitch



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.view.Surface
@@ -284,21 +282,10 @@ class QuickSwitchFromLauncherTest(testSpec: FlickerTestParameter) : BaseTest(tes 
    }



    /** {@inheritDoc} */

    @Postsubmit

    @Presubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @FlakyTest(bugId = 239148258)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 239148258)

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Ignore("Nav bar window becomes invisible during quick switch")

    @Test