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

Commit 17ec432b authored by Nergi Rahardi's avatar Nergi Rahardi
Browse files

Fix WMShellFlickerTestsDesktopMode SnapResizeAppWindow 

Modified the assertion to verify that snapped window bounds
only need to fill 95% of either side of the screen, due to
tiling divider.

Bug: 377090229
Flag: EXEMPT test fix
Test: atest
WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.SnapResizeAppWindowLeftWithButton
Test: atest
WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.SnapResizeAppWindowRightWithButton
Change-Id: Id4cd896cd94f009ee95608d6ec326363c6827242
parent 626a454c

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt

+18 −6
Original line number Diff line number Diff line
@@ -62,6 +62,14 @@ import android.tools.traces.wm.TransitionType 


class DesktopModeFlickerScenarios {

    companion object {

        // In DesktopMode, window snap can be done with just a single window. In this case, the

        // divider tiling between left and right window won't be shown, and hence its states are not

        // obtainable in test.

        // As the test should just focus on ensuring window goes to one side of the screen, an

        // acceptable approach is to ensure snapped window still fills > 95% of either side of the

        // screen.

        private const val SNAP_WINDOW_MAX_DIFF_THRESHOLD_RATIO = 0.05



        val END_DRAG_TO_DESKTOP =

            FlickerConfigEntry(

                scenarioId = ScenarioId("END_DRAG_TO_DESKTOP"),
@@ -230,9 +238,11 @@ class DesktopModeFlickerScenarios { 
                        TaggedCujTransitionMatcher(associatedTransitionRequired = false)

                    )

                    .build(),

                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +

                        listOf(AppWindowCoversLeftHalfScreenAtEnd(DESKTOP_MODE_APP))

                            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + listOf(

                    AppWindowCoversLeftHalfScreenAtEnd(

                        DESKTOP_MODE_APP, SNAP_WINDOW_MAX_DIFF_THRESHOLD_RATIO

                    )

                ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

            )



        val SNAP_RESIZE_RIGHT_WITH_BUTTON =
@@ -245,9 +255,11 @@ class DesktopModeFlickerScenarios { 
                        TaggedCujTransitionMatcher(associatedTransitionRequired = false)

                    )

                    .build(),

                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +

                        listOf(AppWindowCoversRightHalfScreenAtEnd(DESKTOP_MODE_APP))

                            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

                assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + listOf(

                    AppWindowCoversRightHalfScreenAtEnd(

                        DESKTOP_MODE_APP, SNAP_WINDOW_MAX_DIFF_THRESHOLD_RATIO

                    )

                ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

            )



        val SNAP_RESIZE_LEFT_WITH_DRAG =