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

Commit 392fb757 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update task bar assertion on OpenActivityFromBubbleOnLocksreenTest"... 

Merge "Update task bar assertion on OpenActivityFromBubbleOnLocksreenTest" into udc-dev am: bb007550 am: 1ffd32d9

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



Change-Id: I964383be1c8169091339c3dbefb4f5d086ea7a88
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f523aa6 1ffd32d9

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

+21 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.bubble 


import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.tools.common.datatypes.component.ComponentNameMatcher

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest
@@ -29,6 +30,7 @@ import androidx.test.uiautomator.Until 
import com.android.server.wm.flicker.navBarLayerIsVisibleAtEnd

import com.android.server.wm.flicker.navBarLayerPositionAtEnd

import org.junit.Assume

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized
@@ -137,4 +139,23 @@ class OpenActivityFromBubbleOnLocksreenTest(flicker: FlickerTest) : BaseBubbleSc 
        Assume.assumeTrue(flicker.scenario.isGesturalNavigation)

        super.navBarWindowIsAlwaysVisible()

    }



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. Taskbar is not shown on lock screen")

    override fun taskBarLayerIsVisibleAtStartAndEnd() {}



    @Test

    @Ignore("Not applicable to this CUJ. Taskbar is not shown on lock screen")

    override fun taskBarWindowIsAlwaysVisible() {}



    /**

     * Checks that the [ComponentNameMatcher.TASK_BAR] is visible at the end of the transition

     */

    @Postsubmit

    @Test

    fun taskBarLayerIsVisibleAtEnd() {

        Assume.assumeTrue(flicker.scenario.isTablet)

        flicker.assertLayersEnd { this.isVisible(ComponentNameMatcher.TASK_BAR) }

    }

}