Merge "Skip always on navbar assertions on 3 button in lockscreen" (5d7d1378) · Commits · e / os / android_frameworks_base

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

+26 −6

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@ import androidx.test.uiautomator.Until
		import com.android.server.wm.flicker.FlickerBuilder
		import com.android.server.wm.flicker.FlickerTest
		import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.navBarLayerIsVisibleAtEnd
		import com.android.server.wm.flicker.navBarLayerPositionAtEnd
		import org.junit.Assume
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.Parameterized
		@@ -91,6 +94,14 @@ class LaunchBubbleFromLockScreen(flicker: FlickerTest) : BaseBubbleScreen(flicke
		flicker.assertLayersEnd { this.isVisible(testApp) }
		}

		@Postsubmit
		@Test
		fun navBarLayerIsVisibleAtEnd() = flicker.navBarLayerIsVisibleAtEnd()

		@Postsubmit
		@Test
		fun navBarLayerPositionAtEnd() = flicker.navBarLayerPositionAtEnd()

		/** {@inheritDoc} */
		@FlakyTest
		@Test
		@@ -98,19 +109,28 @@ class LaunchBubbleFromLockScreen(flicker: FlickerTest) : BaseBubbleScreen(flicke
		super.visibleLayersShownMoreThanOneConsecutiveEntry()

		/** {@inheritDoc} */
		@FlakyTest(bugId = 206753786)
		@Postsubmit
		@Test
		override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()
		override fun navBarLayerIsVisibleAtStartAndEnd() {
		Assume.assumeTrue(flicker.scenario.isGesturalNavigation)
		super.navBarLayerIsVisibleAtStartAndEnd()
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 206753786)
		@Postsubmit
		@Test
		override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()
		override fun navBarLayerPositionAtStartAndEnd() {
		Assume.assumeTrue(flicker.scenario.isGesturalNavigation)
		super.navBarLayerPositionAtStartAndEnd()
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 206753786)
		@Postsubmit
		@Test
		override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()
		override fun navBarWindowIsAlwaysVisible() {
		Assume.assumeTrue(flicker.scenario.isGesturalNavigation)
		super.navBarWindowIsAlwaysVisible()
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 242088970)