From 0f863707ed38d6090aff4cb1c3d5ad68e787b113 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Mon, 3 Apr 2023 14:21:41 +0000 Subject: [PATCH] Update task bar assertion on OpenActivityFromBubbleOnLocksreenTest Fixes: 237278810 Test: atest WMShellFlickerTests Change-Id: Ia34163ece18e43a7d456f6296e50c8946a8b1b93 --- .../OpenActivityFromBubbleOnLocksreenTest.kt | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt index 416315e4b06d8..18a3aa79f6e21 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/OpenActivityFromBubbleOnLocksreenTest.kt @@ -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) } + } }