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

Merge "Remove FlakyTest and move to Presubmit passing tests" into udc-qpr-dev am: 817ed27f60

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24202150

Change-Id: I3b06fb8d338e8f1d113e3ebc80ec864fe87eb51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2023-07-26 18:02:46 +00:00
committed by Automerger Merge Worker
parent d392574dfa 817ed27f60
commit eff481b288
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipDragTest.kt
View File

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

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipDragThenSnapTest.kt
View File

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

6
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipPinchInTest.kt
View File

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