Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip always on navbar assertions on 3 button in lockscreen"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-04 11:56:54 +00:00
committed by Android (Google) Code Review
parent bb9a1f6c50 e80724d2f1
commit 5d7d1378df
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)