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

Commit 009f9d5f authored by Thales Lima's avatar Thales Lima Committed by Android (Google) Code Review
Browse files

Merge "Add check that Wallpaper is visible to flicker tests" into main

parents 12d3ede4 2a0e85ec

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

+10 −4
Original line number Diff line number Diff line
@@ -19,18 +19,20 @@ package com.android.wm.shell.flicker.exit 
import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice

import android.tools.NavBar

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.FlickerBuilder

import android.tools.flicker.FlickerTest

import android.tools.flicker.FlickerTestFactory

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.traces.component.ComponentNameMatcher.Companion.DESKTOP_WALLPAPER_ACTIVITY

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.DesktopModeBaseTest

import com.android.wm.shell.flicker.utils.appWindowBecomesInvisible

import com.android.wm.shell.flicker.utils.appWindowInsideDisplayBoundsAtEnd

import com.android.wm.shell.flicker.utils.appWindowOnTopAtStart

import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd

import com.android.wm.shell.flicker.utils.appWindowOnTopAtStart

import com.android.wm.shell.flicker.utils.layerIsVisibleAtEnd

import com.android.wm.shell.scenarios.ExitDesktopToFullScreenWithAppHeaderMenu

import com.android.wm.shell.Utils

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith
@@ -78,6 +80,10 @@ class ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest(flicker: FlickerTest) 
    @Test

    fun layerIsVisibleAtEnd() = flicker.layerIsVisibleAtEnd(testApp)



    @Test

    fun wallpaperActivityBecomesInvisible() =

        flicker.appWindowBecomesInvisible(DESKTOP_WALLPAPER_ACTIVITY)



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+6 −0
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ import android.tools.flicker.junit.FlickerParametersRunnerFactory 
import android.tools.flicker.FlickerBuilder

import android.tools.flicker.FlickerTest

import android.tools.flicker.FlickerTestFactory

import android.tools.traces.component.ComponentNameMatcher.Companion.DESKTOP_WALLPAPER_ACTIVITY

import com.android.wm.shell.flicker.DesktopModeBaseTest

import com.android.wm.shell.scenarios.ExitDesktopToSplitScreenWithAppHeaderMenu

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.utils.appWindowBecomesInvisible

import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd

import com.android.wm.shell.flicker.utils.layerBecomesVisible

import com.android.wm.shell.flicker.utils.splitScreenDividerBecomesVisible
@@ -74,6 +76,10 @@ class ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest(flicker: FlickerTest) 
    @Test

    fun layerBecomesVisible() = flicker.layerBecomesVisible(secondApp)



    @Test

    fun wallpaperActivityBecomesInvisible() =

        flicker.appWindowBecomesInvisible(DESKTOP_WALLPAPER_ACTIVITY)



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+6 −0
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ import android.tools.flicker.FlickerBuilder 
import android.tools.flicker.FlickerTest

import android.tools.flicker.FlickerTestFactory

import android.tools.flicker.assertions.FlickerChecker

import android.tools.traces.component.ComponentNameMatcher.Companion.DESKTOP_WALLPAPER_ACTIVITY

import com.android.wm.shell.flicker.DesktopModeBaseTest

import com.android.wm.shell.scenarios.EnterDesktopFromSplitScreenWithAppHandleMenu

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.utils.appWindowBecomesVisible

import com.android.wm.shell.flicker.utils.appWindowInsideDisplayBoundsAtEnd

import com.android.wm.shell.flicker.utils.appWindowIsInvisibleAtEnd

import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd
@@ -83,6 +85,10 @@ class EnterDesktopFromSplitScreenWithAppHandleMenuFlickerTest(flicker: FlickerTe 
    @Test

    fun splitScreenDividerBecomesInvisible() = flicker.splitScreenDividerBecomesInvisible()



    @Test

    fun wallpaperActivityBecomesVisible() =

        flicker.appWindowBecomesVisible(DESKTOP_WALLPAPER_ACTIVITY)



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+10 −3
Original line number Diff line number Diff line
@@ -19,17 +19,19 @@ package com.android.wm.shell.flicker.fundamentals 
import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice

import android.tools.NavBar

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.FlickerBuilder

import android.tools.flicker.FlickerTest

import android.tools.flicker.FlickerTestFactory

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.traces.component.ComponentNameMatcher.Companion.DESKTOP_WALLPAPER_ACTIVITY

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.DesktopModeBaseTest

import com.android.wm.shell.flicker.utils.appWindowBecomesVisible

import com.android.wm.shell.flicker.utils.appWindowInsideDisplayBoundsAtEnd

import com.android.wm.shell.flicker.utils.appWindowOnTopAtEnd

import com.android.wm.shell.flicker.utils.layerIsVisibleAtEnd

import com.android.wm.shell.scenarios.EnterDesktopWithAppHandleMenu

import com.android.wm.shell.Utils

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith
@@ -74,6 +76,11 @@ class EnterDesktopWithAppHandleMenuFlickerTest(flicker: FlickerTest) : 
    @Test

    fun layerIsVisibleAtEnd() = flicker.layerIsVisibleAtEnd(testApp)



    @Test

    fun wallpaperActivityBecomesVisible() =

        flicker.appWindowBecomesVisible(DESKTOP_WALLPAPER_ACTIVITY)





    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic