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

Commit d9c388ce authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

parents fb245f06 ede61485
Loading
Loading
Loading
Loading
+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)
        }
+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)
        }
+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 {