Merge "Only apply ironwood-postsubmit annotation to stable tests" (2b70e5f2) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import org.junit.runners.Parameterized
		*
		* To run this test: `atest WMShellFlickerTests:CopyContentInSplit`
		*/
		@IwTest(focusArea = "sysui")
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@@ -63,32 +62,39 @@ class CopyContentInSplit(testSpec: FlickerTestParameter) : SplitScreenBase(testS
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun splitScreenDividerKeepVisible() = testSpec.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppLayerKeepVisible() = testSpec.layerKeepVisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun textEditAppLayerKeepVisible() = testSpec.layerKeepVisible(textEditApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppBoundsKeepVisible() = testSpec.splitAppLayerBoundsKeepVisible(
		primaryApp, landscapePosLeft = tapl.isTablet, portraitPosTop = false)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun textEditAppBoundsKeepVisible() = testSpec.splitAppLayerBoundsKeepVisible(
		textEditApp, landscapePosLeft = !tapl.isTablet, portraitPosTop = true)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppWindowKeepVisible() = testSpec.appWindowKeepVisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun textEditAppWindowKeepVisible() = testSpec.appWindowKeepVisible(textEditApp)

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import org.junit.runners.Parameterized
		*
		* To run this test: `atest WMShellFlickerTests:DismissSplitScreenByDivider`
		*/
		@IwTest(focusArea = "sysui")
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@@ -74,23 +73,28 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun splitScreenDividerBecomesInvisible() = testSpec.splitScreenDividerBecomesInvisible()

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppLayerBecomesInvisible() = testSpec.layerBecomesInvisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(secondaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppBoundsBecomesInvisible() = testSpec.splitAppLayerBoundsBecomesInvisible(
		primaryApp, landscapePosLeft = tapl.isTablet, portraitPosTop = false)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppBoundsIsFullscreenAtEnd() {
		@@ -113,10 +117,12 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppWindowIsVisibleAtEnd() = testSpec.appWindowIsVisibleAtEnd(secondaryApp)

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import org.junit.runners.Parameterized
		*
		* To run this test: `atest WMShellFlickerTests:DismissSplitScreenByGoHome`
		*/
		@IwTest(focusArea = "sysui")
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@@ -66,32 +65,39 @@ class DismissSplitScreenByGoHome(
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun splitScreenDividerBecomesInvisible() = testSpec.splitScreenDividerBecomesInvisible()

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppLayerBecomesInvisible() = testSpec.layerBecomesInvisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppLayerBecomesInvisible() = testSpec.layerBecomesInvisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppBoundsBecomesInvisible() = testSpec.splitAppLayerBoundsBecomesInvisible(
		primaryApp, landscapePosLeft = tapl.isTablet, portraitPosTop = false)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppBoundsBecomesInvisible() = testSpec.splitAppLayerBoundsBecomesInvisible(
		secondaryApp, landscapePosLeft = !tapl.isTablet, portraitPosTop = true)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(secondaryApp)

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import org.junit.runners.Parameterized
		*
		* To run this test: `atest WMShellFlickerTests:DragDividerToResize`
		*/
		@IwTest(focusArea = "sysui")
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@@ -62,14 +61,17 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun splitScreenDividerKeepVisible() = testSpec.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppLayerKeepVisible() = testSpec.layerKeepVisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppLayerVisibilityChanges() {
		@@ -82,19 +84,23 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppWindowKeepVisible() = testSpec.appWindowKeepVisible(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppWindowKeepVisible() = testSpec.appWindowKeepVisible(secondaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppBoundsChanges() = testSpec.splitAppLayerBoundsChanges(
		primaryApp, landscapePosLeft = true, portraitPosTop = false)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppBoundsChanges() = testSpec.splitAppLayerBoundsChanges(

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import org.junit.runners.Parameterized
		*
		* To run this test: `atest WMShellFlickerTests:EnterSplitScreenByDragFromAllApps`
		*/
		@IwTest(focusArea = "sysui")
		@RequiresDevice
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@@ -81,6 +80,7 @@ class EnterSplitScreenByDragFromAllApps(
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun splitScreenDividerBecomesVisible() {
		@@ -89,6 +89,7 @@ class EnterSplitScreenByDragFromAllApps(
		}

		// TODO(b/245472831): Back to splitScreenDividerBecomesVisible after shell transition ready.
		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun splitScreenDividerIsVisibleAtEnd_ShellTransit() {
		@@ -98,10 +99,12 @@ class EnterSplitScreenByDragFromAllApps(
		}
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppLayerBecomesVisible() {
		@@ -125,20 +128,24 @@ class EnterSplitScreenByDragFromAllApps(
		testSpec.layerBecomesVisible(secondaryApp)
		}

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppBoundsIsVisibleAtEnd() = testSpec.splitAppLayerBoundsIsVisibleAtEnd(
		primaryApp, landscapePosLeft = false, portraitPosTop = false)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppBoundsBecomesVisible() = testSpec.splitAppLayerBoundsBecomesVisibleByDrag(
		secondaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun primaryAppWindowIsVisibleAtEnd() = testSpec.appWindowIsVisibleAtEnd(primaryApp)

		@IwTest(focusArea = "sysui")
		@Presubmit
		@Test
		fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)