Merge "Add FlakyTest annotation to unblock presubmit" (ebf76779) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt

+27 −3

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerBuilder
		import com.android.server.wm.flicker.FlickerTest
		import com.android.server.wm.flicker.FlickerTestFactory
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
		import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
		import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
		@@ -98,7 +99,17 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) {
		}
		}

		@Presubmit @Test fun primaryAppWindowKeepVisible() = flicker.appWindowKeepVisible(primaryApp)
		@Presubmit
		@Test fun primaryAppWindowKeepVisible() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		flicker.appWindowKeepVisible(primaryApp)
		}

		@FlakyTest(bugId = 263213649)
		@Test fun primaryAppWindowKeepVisible_ShellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		flicker.appWindowKeepVisible(primaryApp)
		}

		@Presubmit
		@Test
		@@ -106,14 +117,27 @@ class DragDividerToResize(flicker: FlickerTest) : SplitScreenBase(flicker) {

		@Presubmit
		@Test
		fun primaryAppBoundsChanges() =
		fun primaryAppBoundsChanges() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		flicker.splitAppLayerBoundsChanges(
		primaryApp,
		landscapePosLeft = true,
		portraitPosTop = false
		)
		}

		@FlakyTest(bugId = 263213649)
		@Test
		fun primaryAppBoundsChanges_ShellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		flicker.splitAppLayerBoundsChanges(
		primaryApp,
		landscapePosLeft = true,
		portraitPosTop = false
		)
		}

		@FlakyTest(bugId = 250530664)
		@Presubmit
		@Test
		fun secondaryAppBoundsChanges() =
		flicker.splitAppLayerBoundsChanges(