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

Commit ede61485 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Promote stable flicker tests" into tm-dev am: 633398fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17156223

Change-Id: I9ec2808195c616eb4d67a8227413f4d776cc0788
parents 3266c1d8 633398fe

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt

+14 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.flicker.bubble



import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.uiautomator.By
@@ -24,6 +25,8 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

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

import org.junit.Assume

import org.junit.runner.RunWith

import org.junit.Test

import org.junit.runners.Parameterized
@@ -69,9 +72,19 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr 
            }

        }



    @FlakyTest

    @Presubmit

    @Test

    fun testAppIsVisibleAtEnd() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        testSpec.assertLayersEnd {

            this.isVisible(testApp.component)

        }

    }



    @FlakyTest

    @Test

    fun testAppIsVisibleAtEnd_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        testSpec.assertLayersEnd {

            this.isVisible(testApp.component)

        }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt

+12 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.flicker.bubble



import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import android.platform.test.annotations.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -57,9 +58,19 @@ open class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen 
            }

        }



    @FlakyTest(bugId = 218642026)

    @Presubmit

    @Test

    open fun testAppIsAlwaysVisible() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        testSpec.assertLayers {

            this.isVisible(testApp.component)

        }

    }



    @FlakyTest(bugId = 218642026)

    @Test

    open fun testAppIsAlwaysVisible_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        testSpec.assertLayers {

            this.isVisible(testApp.component)

        }

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) 
     * Checks that the nav bar layer starts invisible, becomes visible during unlocking animation

     * and remains visible at the end

     */

    @Postsubmit

    @Presubmit

    @Test

    fun navBarLayerVisibilityChanges() {

        testSpec.assertLayers {