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

Commit e72586fa authored by Nataniel Borges's avatar Nataniel Borges
Browse files

10/ Stabilize quick switch tests 

Launch the apps in each run to ensure ordering on launcher's overview

Bug: 236131465
Test: atest FlickerTests
Change-Id: Iac91005a9e1cf96f0801aa6c648ddbb030496117
parent 1e6b569c

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

+2 −8
Original line number Diff line number Diff line
@@ -82,19 +82,13 @@ open class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestPa 
            setup {

                test {

                    tapl.setExpectedRotation(testSpec.startRotation)

                }

                eachRun {

                    testApp1.launchViaIntent(wmHelper)

                    testApp2.launchViaIntent(wmHelper)



                    startDisplayBounds = wmHelper.currentState.layerState

                        .physicalDisplayBounds ?: error("Display not found")

                }



                eachRun {

                    tapl.launchedAppState.quickSwitchToPreviousAppSwipeLeft()

                    wmHelper.StateSyncBuilder()

                        .withNavBarStatusBarVisible()

                        .waitForAndVerify()

                }

            }

            transitions {

                tapl.launchedAppState.quickSwitchToPreviousApp()

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

+4 −5
Original line number Diff line number Diff line
@@ -82,17 +82,16 @@ open class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTes 
            setup {

                test {

                    tapl.setExpectedRotation(testSpec.startRotation)

                    testApp1.launchViaIntent(wmHelper)

                    testApp2.launchViaIntent(wmHelper)



                    startDisplayBounds = wmHelper.currentState.layerState

                        .physicalDisplayBounds ?: error("Display not found")

                }

                eachRun {

                    testApp1.launchViaIntent(wmHelper)

                    testApp2.launchViaIntent(wmHelper)

                    tapl.launchedAppState.quickSwitchToPreviousApp()

                    wmHelper.StateSyncBuilder()

                        .withNavBarStatusBarVisible()

                        .waitForAndVerify()

                    startDisplayBounds = wmHelper.currentState.layerState

                        .physicalDisplayBounds ?: error("Display not found")

                }

            }

            transitions {