Merge "Fix navbar layer visibility check on tablet"

This commit is contained in:
Nataniel Borges
2022-07-29 08:20:52 +00:00
committed by Android (Google) Code Review

View File

@@ -74,6 +74,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
@FlakyTest(bugId = 227083463)
@Test
fun navBarLayerVisibilityChanges() {
Assume.assumeFalse(testSpec.isTablet)
testSpec.assertLayers {
this.isInvisible(ComponentMatcher.NAV_BAR)
.then()
@@ -136,27 +137,32 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
/** {@inheritDoc} */
@Test
@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
override fun taskBarLayerIsVisibleAtStartAndEnd() { }
override fun taskBarLayerIsVisibleAtStartAndEnd() {
}
/** {@inheritDoc} */
@Test
@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
override fun navBarLayerIsVisibleAtStartAndEnd() { }
override fun navBarLayerIsVisibleAtStartAndEnd() {
}
/** {@inheritDoc} */
@Test
@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
override fun taskBarWindowIsAlwaysVisible() { }
override fun taskBarWindowIsAlwaysVisible() {
}
/** {@inheritDoc} */
@Test
@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
override fun navBarWindowIsAlwaysVisible() { }
override fun navBarWindowIsAlwaysVisible() {
}
/** {@inheritDoc} */
@Test
@Ignore("Not applicable to this CUJ. Display starts off and app is full screen at the end")
override fun statusBarWindowIsAlwaysVisible() { }
override fun statusBarWindowIsAlwaysVisible() {
}
/**
* Checks the position of the [ComponentMatcher.STATUS_BAR] at the end of the
@@ -172,6 +178,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
@Postsubmit
@Test
fun navBarLayerIsVisibleAtEnd() {
Assume.assumeFalse(testSpec.isTablet)
testSpec.assertLayersEnd {
this.isVisible(ComponentMatcher.NAV_BAR)
}
@@ -181,7 +188,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
@FlakyTest
@Test
override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
super.visibleLayersShownMoreThanOneConsecutiveEntry()
super.visibleLayersShownMoreThanOneConsecutiveEntry()
/** {@inheritDoc} */
@Presubmit
@@ -207,7 +214,7 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
@FlakyTest(bugId = 218470989)
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
super.visibleWindowsShownMoreThanOneConsecutiveEntry()
@FlakyTest(bugId = 227143265)
@Test
@@ -225,12 +232,12 @@ open class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) :
@JvmStatic
fun getParams(): Collection<FlickerTestParameter> {
return FlickerTestParameterFactory.getInstance()
.getConfigNonRotationTests(
repetitions = 3,
supportedNavigationModes =
listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY),
supportedRotations = listOf(Surface.ROTATION_0)
)
.getConfigNonRotationTests(
repetitions = 3,
supportedNavigationModes =
listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY),
supportedRotations = listOf(Surface.ROTATION_0)
)
}
}
}