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

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

Merge "Update TEST_MAPPING in WMShell tests" into main

parents 066a502d 3acd614d

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/Android.bp

+64 −0
Original line number Diff line number Diff line
@@ -51,8 +51,10 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.EnterSplitScreenWithAppHandleMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.MaximizeAppFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.OpenAppFromAllAppsFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.OpenAppFromTaskbarFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.OpenAppsInDesktopModeFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.QuickSwitchBetweenDesktopAndFullscreenTest",

        "com.android.wm.shell.flicker.fundamentals.SwitchFocusBetweenAppsTest",

        "com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest",
@@ -62,6 +64,12 @@ test_module_config { 
        "com.android.wm.shell.flicker.resizing.ResizeAppWithEdgeResizeMouseFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppWithEdgeResizeStylusFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppWithEdgeResizeTouchpadFlickerTest",

        "com.android.wm.shell.flicker.resizing.SnapResizeAppWindowLeftWithButtonFlickerTest",

        "com.android.wm.shell.flicker.resizing.SnapResizeAppWindowLeftWithDragFlickerTest",

        "com.android.wm.shell.flicker.resizing.SnapResizeAppWindowLeftWithKeyboardFlickerTest",

        "com.android.wm.shell.flicker.resizing.SnapResizeAppWindowRightWithButtonFlickerTest",

        "com.android.wm.shell.flicker.resizing.SnapResizeAppWindowRightWithDragFlickerTest",

        "com.android.wm.shell.flicker.resizing.SnapResizeAppWindowRightWithKeyboardFlickerTest",

        "com.android.wm.shell.flicker.tiling.TilingDividerResizingAppsFlickerTest",

        "com.android.wm.shell.flicker.tiling.TilingDividerShownAfterHomeSwipeFlickerTest",

        "com.android.wm.shell.flicker.tiling.TilingDividerShownAfterOverviewFlickerTest",
@@ -119,6 +127,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-MaximizeAppFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.fundamentals.MaximizeAppFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -133,6 +148,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.OpenAppFromTaskbarFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppsInDesktopModeFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.fundamentals.OpenAppsInDesktopModeFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-QuickSwitchBetweenDesktopAndFullscreenTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -196,6 +218,48 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.resizing.ResizeAppWithEdgeResizeTouchpadFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowLeftWithButtonFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.resizing.SnapResizeAppWindowLeftWithButtonFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowLeftWithDragFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.resizing.SnapResizeAppWindowLeftWithDragFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowLeftWithKeyboardFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.resizing.SnapResizeAppWindowLeftWithKeyboardFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowRightWithButtonFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.resizing.SnapResizeAppWindowRightWithButtonFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowRightWithDragFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.resizing.SnapResizeAppWindowRightWithDragFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowRightWithKeyboardFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.resizing.SnapResizeAppWindowRightWithKeyboardFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-tiling-TilingDividerResizingAppsFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/TEST_MAPPING

+24 −0
Original line number Diff line number Diff line
@@ -21,12 +21,18 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-MaximizeAppFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromTaskbarFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppsInDesktopModeFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-QuickSwitchBetweenDesktopAndFullscreenTest"

    },
@@ -54,6 +60,24 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-ResizeAppWithEdgeResizeTouchpadFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowLeftWithButtonFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowLeftWithDragFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowLeftWithKeyboardFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowRightWithButtonFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowRightWithDragFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-SnapResizeAppWindowRightWithKeyboardFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-tiling-TilingDividerResizingAppsFlickerTest"

    },

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/Android.bp

+39 −23
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ test_module_config { 
        "com.android.wm.shell.functional.ExitDesktopWithDragToTopDragZoneTest",

        "com.android.wm.shell.functional.FocusAppFromAllAppsTest",

        "com.android.wm.shell.functional.FocusAppFromTaskbarTest",

        "com.android.wm.shell.functional.MaximizeAppWindowTest",

        "com.android.wm.shell.functional.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

        "com.android.wm.shell.functional.MaximizeAppWindowWithDragToTopDragZoneTest",

        "com.android.wm.shell.functional.MinimizeAppWindowsTest",
@@ -116,7 +115,6 @@ test_module_config { 
        "com.android.wm.shell.functional.MinimizeWindowOnAppOpenViaIntentTest",

        "com.android.wm.shell.functional.MoveToNextDisplayTest",

        "com.android.wm.shell.functional.OpenAppWithExternalDisplayConnectedTest",

        "com.android.wm.shell.functional.OpenAppsInDesktopModeTest",

        "com.android.wm.shell.functional.OpenTrampolineAppInDesktopModeTaskLimitTest",

        "com.android.wm.shell.functional.OpenUnlimitedAppsTest",

        "com.android.wm.shell.functional.SwitchToOverviewFromDesktopTest",
@@ -128,10 +126,13 @@ test_module_config { 
        "com.android.wm.shell.functional.fundamentals.CloseAllAppsViaAppHeaderExitTest",

        "com.android.wm.shell.functional.fundamentals.CloseAllAppsWithBackNavigationTest",

        "com.android.wm.shell.functional.fundamentals.EnterDesktopFromSplitScreenWithAppHandleMenuTest",

        "com.android.wm.shell.functional.fundamentals.EnterSplitScreenWithAppHandleMenuTest",

        "com.android.wm.shell.functional.fundamentals.ExitDesktopToFullScreenWithAppHeaderMenuTest",

        "com.android.wm.shell.functional.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuTest",

        "com.android.wm.shell.functional.fundamentals.MaximizeAppWindowTest",

        "com.android.wm.shell.functional.fundamentals.OpenAppFromAllAppsTest",

        "com.android.wm.shell.functional.fundamentals.OpenAppFromTaskbarTest",

        "com.android.wm.shell.functional.fundamentals.OpenAppsInDesktopModeTest",

        "com.android.wm.shell.functional.fundamentals.QuickSwitchBetweenDesktopAndFullscreenTest",

        "com.android.wm.shell.functional.fundamentals.SwitchFocusBetweenAppsTest",

        "com.android.wm.shell.functional.fundamentals.SwitchToHomeFromDesktopTest",
@@ -142,6 +143,7 @@ test_module_config { 
        "com.android.wm.shell.functional.resizing.ScaleDensityForExternalDisplayTest",

        "com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithButtonTest",

        "com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithDragTest",

        "com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithKeyboardTest",

    ],

}
@@ -229,13 +231,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.EnterDesktopWithDragWindowsLimitTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-ExitDesktopToFullScreenWithAppHeaderMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.fundamentals.ExitDesktopToFullScreenWithAppHeaderMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-ExitDesktopWithDragToTopDragZoneTest",

    base: "FunctionalTestsDesktopMode",
@@ -257,13 +252,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.FocusAppFromTaskbarTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MaximizeAppWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.MaximizeAppWindowTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

    base: "FunctionalTestsDesktopMode",
@@ -320,13 +308,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.OpenAppWithExternalDisplayConnectedTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-OpenAppsInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.OpenAppsInDesktopModeTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-OpenTrampolineAppInDesktopModeTaskLimitTest",

    base: "FunctionalTestsDesktopMode",
@@ -404,6 +385,20 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterDesktopFromSplitScreenWithAppHandleMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterSplitScreenWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterSplitScreenWithAppHandleMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-ExitDesktopToFullScreenWithAppHeaderMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.fundamentals.ExitDesktopToFullScreenWithAppHeaderMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-ExitDesktopToSplitScreenWithAppHeaderMenuTest",

    base: "FunctionalTestsDesktopMode",
@@ -411,6 +406,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-MaximizeAppWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.fundamentals.MaximizeAppWindowTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-OpenAppFromAllAppsTest",

    base: "FunctionalTestsDesktopMode",
@@ -425,6 +427,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.OpenAppFromTaskbarTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-OpenAppsInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.fundamentals.OpenAppsInDesktopModeTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-QuickSwitchBetweenDesktopAndFullscreenTest",

    base: "FunctionalTestsDesktopMode",
@@ -494,3 +503,10 @@ test_module_config { 
    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithDragTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-SnapResizeAppWindowWithKeyboardTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithKeyboardTest"],

}

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/TEST_MAPPING

+15 −9
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 
    {

      "name": "FunctionalTestsDesktopMode-EnterDesktopWithDragWindowsLimitTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-ExitDesktopToFullScreenWithAppHeaderMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-ExitDesktopWithDragToTopDragZoneTest"

    },
@@ -66,9 +63,6 @@ 
    {

      "name": "FunctionalTestsDesktopMode-FocusAppFromTaskbarTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MaximizeAppWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"

    },
@@ -93,9 +87,6 @@ 
    {

      "name": "FunctionalTestsDesktopMode-OpenAppWithExternalDisplayConnectedTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-OpenAppsInDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-OpenTrampolineAppInDesktopModeTaskLimitTest"

    },
@@ -129,15 +120,27 @@ 
    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterSplitScreenWithAppHandleMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-ExitDesktopToFullScreenWithAppHeaderMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-ExitDesktopToSplitScreenWithAppHeaderMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-MaximizeAppWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-OpenAppFromAllAppsTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-OpenAppFromTaskbarTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-OpenAppsInDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-QuickSwitchBetweenDesktopAndFullscreenTest"

    },
@@ -167,6 +170,9 @@ 
    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-SnapResizeAppWindowWithDragTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-SnapResizeAppWindowWithKeyboardTest"

    }

  ]

}
 
 No newline at end of file