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

Commit 61c3ea17 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Move Pip assertions to flickerlib 

Previously the assertions were part of WMShell, however it is easier to keep them in the library as they can be used in other projects

Test: atest FlickerTests WMShellFlickerTests
Bug: 162925924
Change-Id: Ia6ca7cce1da81be2b73166acce40218bc304a77a
parent 6242b006

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/PipAppHelper.kt

+4 −6
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import com.android.server.wm.flicker.helpers.SYSTEMUI_PACKAGE 
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import com.android.wm.shell.flicker.pip.tv.closeTvPipWindow

import com.android.wm.shell.flicker.pip.tv.isFocusedOrHasFocusedChild

import com.android.wm.shell.flicker.pip.waitPipWindowGone

import com.android.wm.shell.flicker.pip.waitPipWindowShown

import com.android.wm.shell.flicker.testapp.Components



class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper(
@@ -64,7 +62,7 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper( 
        stringExtras: Map<String, String>

    ) {

        super.launchViaIntent(wmHelper, expectedWindowName, action, stringExtras)

        wmHelper.waitPipWindowShown()

        wmHelper.waitFor { it.wmState.hasPipWindow() }

    }



    private fun focusOnObject(selector: BySelector): Boolean {
@@ -86,7 +84,7 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper( 
        clickObject(ENTER_PIP_BUTTON_ID)



        // Wait on WMHelper or simply wait for 3 seconds

        wmHelper?.waitPipWindowShown() ?: SystemClock.sleep(3_000)

        wmHelper?.waitFor { it.wmState.hasPipWindow() } ?: SystemClock.sleep(3_000)

    }



    fun clickStartMediaSessionButton() {
@@ -139,7 +137,7 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper( 
        }



        // Wait for animation to complete.

        wmHelper.waitPipWindowGone()

        wmHelper.waitFor { !it.wmState.hasPipWindow() }

        wmHelper.waitForHomeActivityVisible()

    }
@@ -169,7 +167,7 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper( 
        val windowRect = windowRegion.bounds

        uiDevice.click(windowRect.centerX(), windowRect.centerY())

        uiDevice.click(windowRect.centerX(), windowRect.centerY())

        wmHelper.waitPipWindowGone()

        wmHelper.waitFor { !it.wmState.hasPipWindow() }

        wmHelper.waitForAppTransitionIdle()

    }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class EnterPipToOtherOrientationTest( 
                // Enter PiP, and assert that the PiP is within bounds now that the device is back

                // in portrait

                broadcastActionTrigger.doAction(ACTION_ENTER_PIP)

                wmHelper.waitPipWindowShown()

                wmHelper.waitFor { it.wmState.hasPipWindow() }

                wmHelper.waitForAppTransitionIdle()

            }

        }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/Extensions.kt

+1 −49
Original line number Diff line number Diff line
@@ -16,62 +16,14 @@ 


package com.android.wm.shell.flicker.pip



import android.app.WindowConfiguration

import android.content.ComponentName

import com.android.server.wm.flicker.traces.windowmanager.WindowManagerStateSubject

import com.android.server.wm.traces.common.windowmanager.WindowManagerState

import com.android.server.wm.traces.parser.toWindowName

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import com.google.common.truth.Truth



inline val WindowManagerState.pinnedWindows

    get() = visibleWindows

        .filter { it.windowingMode == WindowConfiguration.WINDOWING_MODE_PINNED }



/**

 * Checks if the state has any window in PIP mode

 */

fun WindowManagerState.hasPipWindow(): Boolean = pinnedWindows.isNotEmpty()



/**

 * Checks that an activity [activity] is in PIP mode

 */

fun WindowManagerState.isInPipMode(activity: ComponentName): Boolean {

    val windowName = activity.toWindowName()

    return pinnedWindows.any { it.title == windowName }

}



/**

 * Asserts that an activity [activity] exists and is in PIP mode

 */

fun WindowManagerStateSubject.isInPipMode(

    activity: ComponentName

): WindowManagerStateSubject = apply {

    val windowName = activity.toWindowName()

    contains(windowName)

    val pinnedWindows = wmState.pinnedWindows

        .map { it.title }

    Truth.assertWithMessage("Window not in PIP mode")

        .that(pinnedWindows)

        .contains(windowName)

}



/**

 * Waits until the state has a window in PIP mode, i.e., with

 * windowingMode = WindowConfiguration.WINDOWING_MODE_PINNED

 */

fun WindowManagerStateHelper.waitPipWindowShown(): Boolean =

    waitFor("PIP window shown") {

        val result = it.wmState.hasPipWindow()

        result

    }



/**

 * Waits until the state doesn't have a window in PIP mode, i.e., with

 * windowingMode = WindowConfiguration.WINDOWING_MODE_PINNED

 */

fun WindowManagerStateHelper.waitPipWindowGone(): Boolean =

    waitFor("PIP window gone") {

        val result = !it.wmState.hasPipWindow()

        result

    return isInPipMode(windowName)

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt

+2 −2
Original line number Diff line number Diff line
@@ -131,13 +131,13 @@ abstract class PipTransition(protected val testSpec: FlickerTestParameter) { 
                    removeAllTasksButHome()

                    if (!eachRun) {

                        pipApp.launchViaIntent(wmHelper, stringExtras = stringExtras)

                        wmHelper.waitPipWindowShown()

                        wmHelper.waitFor { it.wmState.hasPipWindow() }

                    }

                }

                eachRun {

                    if (eachRun) {

                        pipApp.launchViaIntent(wmHelper, stringExtras = stringExtras)

                        wmHelper.waitPipWindowShown()

                        wmHelper.waitFor { it.wmState.hasPipWindow() }

                    }

                }

            }