Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9413f6eb authored by Chilun Huang's avatar Chilun Huang
Browse files

Only apply ironwood-postsubmit annotation to stable tests 

Only apply @IwTest to those tests with @Presubmit.

Bug: 225582520
Bug: 245722917
Test: atest --test-mapping
frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell:ironwood-postsubmit

Change-Id: I63b8384bcdc2a0c5715eae11150ef34e3b67032d
parent b234ca2f

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)
@@ -65,32 +64,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
@@ -45,7 +45,6 @@ import org.junit.runners.Parameterized 
 *

 * To run this test: `atest WMShellFlickerTests:DismissSplitScreenByDivider`

 */

@IwTest(focusArea = "sysui")

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
@@ -75,23 +74,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() {
@@ -114,10 +118,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)
@@ -68,32 +67,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)
@@ -64,14 +63,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() {
@@ -84,19 +86,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)
@@ -83,6 +82,7 @@ class EnterSplitScreenByDragFromAllApps( 
            }

        }



    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun splitScreenDividerBecomesVisible() {
@@ -91,6 +91,7 @@ class EnterSplitScreenByDragFromAllApps( 
    }



    // TODO(b/245472831): Back to splitScreenDividerBecomesVisible after shell transition ready.

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun splitScreenDividerIsVisibleAtEnd_ShellTransit() {
@@ -100,28 +101,34 @@ class EnterSplitScreenByDragFromAllApps( 
        }

    }



    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun primaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(primaryApp)



    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun secondaryAppLayerBecomesVisible() = 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)