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

Commit 65e48d71 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update test_module_configs for split screen tests" into main

parents 3c3635b2 0ea8a875

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/Android.bp

+53 −57
Original line number Diff line number Diff line
@@ -69,152 +69,148 @@ android_test { 
    data: ["trace_config/*"],

}



////////////////////////////////////////////////////////////////////////////////

// Begin breakdowns for FlickerTestsRotation module

// Auto generated section, don't update it manually



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-CatchAll",

    base: "WMShellFlickerTestsSplitScreen",

    test_suites: ["device-tests"],

    exclude_filters: [

        "com.android.wm.shell.flicker.splitscreen.CopyContentInSplit",

        "com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByDivider",

        "com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByGoHome",

        "com.android.wm.shell.flicker.splitscreen.DragDividerToResize",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromAllApps",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromNotification",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromShortcut",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromTaskbar",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenFromOverview",

        "com.android.wm.shell.flicker.splitscreen.MultipleShowImeRequestsInSplitScreen",

        "com.android.wm.shell.flicker.splitscreen.SwitchAppByDoubleTapDivider",

        "com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromAnotherApp",

        "com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromHome",

        "com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromRecent",

        "com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairs",

        "com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairsNoPip",

        "com.android.wm.shell.flicker.splitscreen.",

        "com.android.wm.shell.flicker.splitscreen.CopyContentInSplitTest",

        "com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByDividerTest",

        "com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByGoHomeTest",

        "com.android.wm.shell.flicker.splitscreen.DragDividerToResizeTest",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromAllAppsTest",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromNotificationTest",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromShortcutTest",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromTaskbarTest",

        "com.android.wm.shell.flicker.splitscreen.EnterSplitScreenFromOverviewTest",

        "com.android.wm.shell.flicker.splitscreen.MultipleShowImeRequestsInSplitScreenTest",

        "com.android.wm.shell.flicker.splitscreen.SwitchAppByDoubleTapDividerTest",

        "com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromAnotherAppTest",

        "com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromHomeTest",

        "com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromRecentTest",

        "com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairsNoPipTest",

        "com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairsTest",

        "com.android.wm.shell.flicker.splitscreen.UnlockKeyguardToSplitScreenTest",

    ],

    test_suites: ["device-tests"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-CopyContentInSplit",

    name: "WMShellFlickerTestsSplitScreen-CopyContentInSplitTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.CopyContentInSplit"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.CopyContentInSplitTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-DismissSplitScreenByDivider",

    name: "WMShellFlickerTestsSplitScreen-DismissSplitScreenByDividerTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByDivider"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByDividerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-DismissSplitScreenByGoHome",

    name: "WMShellFlickerTestsSplitScreen-DismissSplitScreenByGoHomeTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByGoHome"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.DismissSplitScreenByGoHomeTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-DragDividerToResize",

    name: "WMShellFlickerTestsSplitScreen-DragDividerToResizeTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.DragDividerToResize"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.DragDividerToResizeTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromAllApps",

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromAllAppsTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromAllApps"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromAllAppsTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromNotification",

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromNotificationTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromNotification"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromNotificationTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromShortcut",

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromShortcutTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromShortcut"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromShortcutTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromTaskbar",

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromTaskbarTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromTaskbar"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenByDragFromTaskbarTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenFromOverview",

    name: "WMShellFlickerTestsSplitScreen-EnterSplitScreenFromOverviewTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenFromOverview"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.EnterSplitScreenFromOverviewTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-MultipleShowImeRequestsInSplitScreen",

    name: "WMShellFlickerTestsSplitScreen-MultipleShowImeRequestsInSplitScreenTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.MultipleShowImeRequestsInSplitScreen"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.MultipleShowImeRequestsInSplitScreenTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-SwitchAppByDoubleTapDivider",

    name: "WMShellFlickerTestsSplitScreen-SwitchAppByDoubleTapDividerTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchAppByDoubleTapDivider"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchAppByDoubleTapDividerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromAnotherApp",

    name: "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromAnotherAppTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromAnotherApp"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromAnotherAppTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromHome",

    name: "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromHomeTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromHome"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromHomeTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromRecent",

    name: "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromRecentTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromRecent"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBackToSplitFromRecentTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairs",

    name: "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairsNoPipTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairs"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairsNoPipTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairsNoPip",

    name: "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairsTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairsNoPip"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairsTest"],

}



test_module_config {

    name: "WMShellFlickerTestsSplitScreen-UnlockKeyguardToSplitScreen",

    name: "WMShellFlickerTestsSplitScreen-UnlockKeyguardToSplitScreenTest",

    base: "WMShellFlickerTestsSplitScreen",

    include_filters: ["com.android.wm.shell.flicker.splitscreen.UnlockKeyguardToSplitScreen"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.splitscreen.UnlockKeyguardToSplitScreenTest"],

}
 


// End breakdowns for FlickerTestsRotation module

////////////////////////////////////////////////////////////////////////////////

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/TEST_MAPPING

+17 −17
Original line number Diff line number Diff line
@@ -4,55 +4,55 @@ 
      "name": "WMShellFlickerTestsSplitScreen-CatchAll"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-CopyContentInSplit"

      "name": "WMShellFlickerTestsSplitScreen-CopyContentInSplitTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-DismissSplitScreenByDivider"

      "name": "WMShellFlickerTestsSplitScreen-DismissSplitScreenByDividerTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-DismissSplitScreenByGoHome"

      "name": "WMShellFlickerTestsSplitScreen-DismissSplitScreenByGoHomeTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-DragDividerToResize"

      "name": "WMShellFlickerTestsSplitScreen-DragDividerToResizeTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromAllApps"

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromAllAppsTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromNotification"

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromNotificationTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromShortcut"

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromShortcutTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromTaskbar"

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenByDragFromTaskbarTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenFromOverview"

      "name": "WMShellFlickerTestsSplitScreen-EnterSplitScreenFromOverviewTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-MultipleShowImeRequestsInSplitScreen"

      "name": "WMShellFlickerTestsSplitScreen-MultipleShowImeRequestsInSplitScreenTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-SwitchAppByDoubleTapDivider"

      "name": "WMShellFlickerTestsSplitScreen-SwitchAppByDoubleTapDividerTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromAnotherApp"

      "name": "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromAnotherAppTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromHome"

      "name": "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromHomeTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromRecent"

      "name": "WMShellFlickerTestsSplitScreen-SwitchBackToSplitFromRecentTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairs"

      "name": "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairsNoPipTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairsNoPip"

      "name": "WMShellFlickerTestsSplitScreen-SwitchBetweenSplitPairsTest"

    },

    {

      "name": "WMShellFlickerTestsSplitScreen-UnlockKeyguardToSplitScreen"

      "name": "WMShellFlickerTestsSplitScreen-UnlockKeyguardToSplitScreenTest"

    }

  ]

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt→libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplitTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CopyContentInSplit(override val flicker: LegacyFlickerTest) :

class CopyContentInSplitTest(override val flicker: LegacyFlickerTest) :

    CopyContentInSplitBenchmark(flicker), ICommonAssertions {

    override val transition: FlickerBuilder.() -> Unit

        get() = {

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt→libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDividerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class DismissSplitScreenByDivider(override val flicker: LegacyFlickerTest) :

class DismissSplitScreenByDividerTest(override val flicker: LegacyFlickerTest) :

    DismissSplitScreenByDividerBenchmark(flicker), ICommonAssertions {



    override val transition: FlickerBuilder.() -> Unit

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt→libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHomeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

class DismissSplitScreenByGoHome(override val flicker: LegacyFlickerTest) :

class DismissSplitScreenByGoHomeTest(override val flicker: LegacyFlickerTest) :

    DismissSplitScreenByGoHomeBenchmark(flicker), ICommonAssertions {

    @JvmField

    @Rule