Merge "Update task bar assertion on OpenActivityFromBubbleOnLocksreenTest" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
bb0075507d
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.bubble
|
|||||||
|
|
||||||
import android.platform.test.annotations.FlakyTest
|
import android.platform.test.annotations.FlakyTest
|
||||||
import android.platform.test.annotations.Postsubmit
|
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.junit.FlickerParametersRunnerFactory
|
||||||
import android.tools.device.flicker.legacy.FlickerBuilder
|
import android.tools.device.flicker.legacy.FlickerBuilder
|
||||||
import android.tools.device.flicker.legacy.FlickerTest
|
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.navBarLayerIsVisibleAtEnd
|
||||||
import com.android.server.wm.flicker.navBarLayerPositionAtEnd
|
import com.android.server.wm.flicker.navBarLayerPositionAtEnd
|
||||||
import org.junit.Assume
|
import org.junit.Assume
|
||||||
|
import org.junit.Ignore
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import org.junit.runner.RunWith
|
import org.junit.runner.RunWith
|
||||||
import org.junit.runners.Parameterized
|
import org.junit.runners.Parameterized
|
||||||
@@ -137,4 +139,23 @@ class OpenActivityFromBubbleOnLocksreenTest(flicker: FlickerTest) : BaseBubbleSc
|
|||||||
Assume.assumeTrue(flicker.scenario.isGesturalNavigation)
|
Assume.assumeTrue(flicker.scenario.isGesturalNavigation)
|
||||||
super.navBarWindowIsAlwaysVisible()
|
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) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user