Merge "Remove FlakyTest and move to Presubmit passing tests" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
817ed27f60
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package com.android.wm.shell.flicker.pip
|
package com.android.wm.shell.flicker.pip
|
||||||
|
|
||||||
import android.platform.test.annotations.Postsubmit
|
import android.platform.test.annotations.Presubmit
|
||||||
import android.platform.test.annotations.RequiresDevice
|
import android.platform.test.annotations.RequiresDevice
|
||||||
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
|
||||||
@@ -62,7 +62,7 @@ class PipDragTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Postsubmit
|
@Presubmit
|
||||||
@Test
|
@Test
|
||||||
fun pipLayerMovesAwayFromEdge() {
|
fun pipLayerMovesAwayFromEdge() {
|
||||||
flicker.assertLayers {
|
flicker.assertLayers {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
package com.android.wm.shell.flicker.pip
|
package com.android.wm.shell.flicker.pip
|
||||||
|
|
||||||
import android.graphics.Rect
|
import android.graphics.Rect
|
||||||
import android.platform.test.annotations.Postsubmit
|
import android.platform.test.annotations.Presubmit
|
||||||
import android.tools.common.Rotation
|
import android.tools.common.Rotation
|
||||||
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
|
||||||
@@ -80,7 +80,7 @@ class PipDragThenSnapTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
|
|||||||
/**
|
/**
|
||||||
* Checks that the visible region area of [pipApp] moves to closest edge during the animation.
|
* Checks that the visible region area of [pipApp] moves to closest edge during the animation.
|
||||||
*/
|
*/
|
||||||
@Postsubmit
|
@Presubmit
|
||||||
@Test
|
@Test
|
||||||
fun pipLayerMovesToClosestEdge() {
|
fun pipLayerMovesToClosestEdge() {
|
||||||
flicker.assertLayers {
|
flicker.assertLayers {
|
||||||
|
|||||||
@@ -16,8 +16,7 @@
|
|||||||
|
|
||||||
package com.android.wm.shell.flicker.pip
|
package com.android.wm.shell.flicker.pip
|
||||||
|
|
||||||
import android.platform.test.annotations.FlakyTest
|
import android.platform.test.annotations.Presubmit
|
||||||
import android.platform.test.annotations.Postsubmit
|
|
||||||
import android.tools.common.Rotation
|
import android.tools.common.Rotation
|
||||||
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
|
||||||
@@ -35,14 +34,13 @@ import org.junit.runners.Parameterized
|
|||||||
@RunWith(Parameterized::class)
|
@RunWith(Parameterized::class)
|
||||||
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
|
||||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||||
@FlakyTest(bugId = 270677470)
|
|
||||||
class PipPinchInTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
|
class PipPinchInTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
|
||||||
override val thisTransition: FlickerBuilder.() -> Unit = {
|
override val thisTransition: FlickerBuilder.() -> Unit = {
|
||||||
transitions { pipApp.pinchInPipWindow(wmHelper, 0.4f, 30) }
|
transitions { pipApp.pinchInPipWindow(wmHelper, 0.4f, 30) }
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Checks that the visible region area of [pipApp] always decreases during the animation. */
|
/** Checks that the visible region area of [pipApp] always decreases during the animation. */
|
||||||
@Postsubmit
|
@Presubmit
|
||||||
@Test
|
@Test
|
||||||
fun pipLayerAreaDecreases() {
|
fun pipLayerAreaDecreases() {
|
||||||
flicker.assertLayers {
|
flicker.assertLayers {
|
||||||
|
|||||||
Reference in New Issue
Block a user