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

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

Merge "Promote passing quick switch tests"

parents 229e0689 8bdd9e9c

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

+1 −11
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 android.view.Surface
@@ -104,7 +103,7 @@ open class QuickSwitchBetweenTwoAppsBackTest(testSpec: FlickerTestParameter) : B 
     * Checks that the transition starts with [testApp2]'s layers filling/covering exactly the

     * entirety of the display.

     */

    @FlakyTest(bugId = 250520840)

    @Presubmit

    @Test

    open fun startsWithApp2LayersCoverFullScreen() {

        testSpec.assertLayersStart {
@@ -236,15 +235,6 @@ open class QuickSwitchBetweenTwoAppsBackTest(testSpec: FlickerTestParameter) : B 
        }

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    @FlakyTest(bugId = 250518877)

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    companion object {

        private var startDisplayBounds = Rect.EMPTY

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

+13 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

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

import com.android.server.wm.flicker.navBarWindowIsVisibleAtStartAndEnd

import com.android.server.wm.traces.common.ComponentNameMatcher

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder
@@ -61,8 +62,8 @@ open class QuickSwitchBetweenTwoAppsBackTest_ShellTransit(testSpec: FlickerTestP 
    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /**

     * Checks that [ComponentMatcher.NAV_BAR] window is visible and above the app windows at the

     * start and end of the WM trace

     * Checks that [ComponentNameMatcher.NAV_BAR] window is visible and above the app windows at

     * the start and end of the WM trace

     */

    @Presubmit

    @Test
@@ -71,8 +72,18 @@ open class QuickSwitchBetweenTwoAppsBackTest_ShellTransit(testSpec: FlickerTestP 
        testSpec.navBarWindowIsVisibleAtStartAndEnd()

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 250520840)

    @Test

    override fun startsWithApp2LayersCoverFullScreen() =

        super.startsWithApp2LayersCoverFullScreen()



    @FlakyTest(bugId = 246284708)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 250518877)

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()

}

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

+1 −6
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 android.view.Surface
@@ -116,7 +115,7 @@ open class QuickSwitchBetweenTwoAppsForwardTest(testSpec: FlickerTestParameter) 
     * Checks that the transition starts with [testApp1]'s layers filling/covering exactly the

     * entirety of the display.

     */

    @FlakyTest(bugId = 250522691)

    @Presubmit

    @Test

    open fun startsWithApp1LayersCoverFullScreen() {

        testSpec.assertLayersStart {
@@ -255,10 +254,6 @@ open class QuickSwitchBetweenTwoAppsForwardTest(testSpec: FlickerTestParameter) 
    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd()



    @FlakyTest(bugId = 250518877)

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    companion object {

        private var startDisplayBounds = Rect.EMPTY

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

+12 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

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

import com.android.server.wm.flicker.navBarWindowIsVisibleAtStartAndEnd

import com.android.server.wm.traces.common.ComponentNameMatcher

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder
@@ -62,8 +63,8 @@ open class QuickSwitchBetweenTwoAppsForwardTest_ShellTransit(testSpec: FlickerTe 
    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /**

     * Checks that [ComponentMatcher.NAV_BAR] window is visible and above the app windows at the

     * start and end of the WM trace

     * Checks that [ComponentNameMatcher.NAV_BAR] window is visible and above the app windows at

     * the start and end of the WM trace

     */

    @Presubmit

    @Test
@@ -76,4 +77,13 @@ open class QuickSwitchBetweenTwoAppsForwardTest_ShellTransit(testSpec: FlickerTe 
    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 250518877)

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    @FlakyTest(bugId = 250522691)

    @Test

    override fun startsWithApp1LayersCoverFullScreen() =

        super.startsWithApp1LayersCoverFullScreen()

}