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

Commit 6fa77f07 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Update test_mapping and soong config" into main

parents 34556545 beaee74e

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/Android.bp

+26 −1
Original line number Diff line number Diff line
@@ -49,17 +49,28 @@ android_test { 


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



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-BubbleBarMovesTest",

    base: "WMShellExplicitFlickerTestsBubbles",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.bubbles.BubbleBarMovesTest"],

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-CatchAll",

    base: "WMShellExplicitFlickerTestsBubbles",

    test_suites: ["device-tests"],

    exclude_filters: [

        "com.android.wm.shell.flicker.bubbles.BubbleBarMovesTest",

        "com.android.wm.shell.flicker.bubbles.CollapseBubbleAppViaBackTest",

        "com.android.wm.shell.flicker.bubbles.DismissExpandedBubbleViaBubbleViewTest",

        "com.android.wm.shell.flicker.bubbles.EnterBubbleViaBubbleMenuTest",

        "com.android.wm.shell.flicker.bubbles.EnterBubbleViaDragToBubbleBarTest",

        "com.android.wm.shell.flicker.bubbles.EnterBubbleWithImeViaBubbleMenuTest",

        "com.android.wm.shell.flicker.bubbles.ExpandBubbleViaBubbleStackTest",

        "com.android.wm.shell.flicker.bubbles.ExpandBubbleWithImeViaBubbleBarTest",

        "com.android.wm.shell.flicker.bubbles.LaunchMultipleBubbleTest",

        "com.android.wm.shell.flicker.bubbles.ScrollableBubbleAppTest",

    ],

}
@@ -87,8 +98,8 @@ test_module_config { 
test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaDragToBubbleBarTest",

    base: "WMShellExplicitFlickerTestsBubbles",

    include_filters: ["com.android.wm.shell.flicker.bubbles.EnterBubbleViaDragToBubbleBarTest"],

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.bubbles.EnterBubbleViaDragToBubbleBarTest"],

}



test_module_config {
@@ -111,3 +122,17 @@ test_module_config { 
    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.bubbles.ExpandBubbleWithImeViaBubbleBarTest"],

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-LaunchMultipleBubbleTest",

    base: "WMShellExplicitFlickerTestsBubbles",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.bubbles.LaunchMultipleBubbleTest"],

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-ScrollableBubbleAppTest",

    base: "WMShellExplicitFlickerTestsBubbles",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.bubbles.ScrollableBubbleAppTest"],

}

libs/WindowManager/Shell/tests/e2e/bubbles/flicker-explicit/TEST_MAPPING

+9 −0
Original line number Diff line number Diff line 
{

  "wm": [

    {

      "name": "WMShellExplicitFlickerTestsBubbles-BubbleBarMovesTest"

    },

    {

      "name": "WMShellExplicitFlickerTestsBubbles-CatchAll"

    },
@@ -23,6 +26,12 @@ 
    },

    {

      "name": "WMShellExplicitFlickerTestsBubbles-ExpandBubbleWithImeViaBubbleBarTest"

    },

    {

      "name": "WMShellExplicitFlickerTestsBubbles-LaunchMultipleBubbleTest"

    },

    {

      "name": "WMShellExplicitFlickerTestsBubbles-ScrollableBubbleAppTest"

    }

  ]

}

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

+79 −0
Original line number Diff line number Diff line
@@ -107,10 +107,14 @@ test_module_config { 
        "com.android.wm.shell.functional.UnminimizeAppFromTaskbarTest",

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

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

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

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

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

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

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

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

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

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

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

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

        "com.android.wm.shell.functional.fundamentals.OpenAppFromAllAppsTest",
@@ -120,6 +124,7 @@ test_module_config { 
        "com.android.wm.shell.functional.fundamentals.SwitchFocusBetweenAppsTest",

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

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

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

        "com.android.wm.shell.functional.fundamentals.focus.ClickAndFocusTest",

        "com.android.wm.shell.functional.fundamentals.focus.CloseThenMoveFocusTest",

        "com.android.wm.shell.functional.fundamentals.focus.DragAndKeepFocusTest",
@@ -131,6 +136,9 @@ test_module_config { 
        "com.android.wm.shell.functional.maximize.ExitDesktopWithDragToTopDragZoneTest",

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

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

        "com.android.wm.shell.functional.mediaprojection.StartAppMediaProjectionResizeAndDragTest",

        "com.android.wm.shell.functional.mediaprojection.StartAppMediaProjectionWithMaxDesktopWindowsTest",

        "com.android.wm.shell.functional.mediaprojection.StartScreenMediaProjectionWithMaxDesktopWindowsTest",

        "com.android.wm.shell.functional.minimize.MinimizeAppWindowsTest",

        "com.android.wm.shell.functional.minimize.MinimizeAutoPipAppWindowTest",

        "com.android.wm.shell.functional.minimize.MinimizeWindowOnAppOpenTest",
@@ -143,6 +151,7 @@ test_module_config { 
        "com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithButtonTest",

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

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

        "com.android.wm.shell.functional.tiling.TilingTest",

    ],

}
@@ -307,6 +316,20 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.CloseAllAppsWithBackNavigationTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-DragAppWindowMultiWindowAndPipTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-DragAppWindowSingleWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",
@@ -314,6 +337,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterDesktopFromSplitScreenWithAppHandleMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterDesktopWithAppHandleMenuExistingWindowsTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterDesktopWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",
@@ -335,6 +365,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterSplitScreenWithAppHandleMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterSplitScreenWithDragTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-ExitDesktopToFullScreenWithAppHeaderMenuTest",

    base: "FunctionalTestsDesktopMode",
@@ -398,6 +435,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.SwitchToOverviewFromDesktopTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-TaskbarInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-focus-ClickAndFocusTest",

    base: "FunctionalTestsDesktopMode",
@@ -447,6 +491,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.keyboardshortcuts.ExitDesktopFromKeyboardShortcutTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-ExitDesktopWithDragToTopDragZoneTest",

    base: "FunctionalTestsDesktopMode",
@@ -468,6 +519,27 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-mediaprojection-StartAppMediaProjectionResizeAndDragTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-mediaprojection-StartAppMediaProjectionWithMaxDesktopWindowsTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-mediaprojection-StartScreenMediaProjectionWithMaxDesktopWindowsTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-minimize-MinimizeAppWindowsTest",

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

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-tiling-TilingTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}

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

+28 −1
Original line number Diff line number Diff line
@@ -84,9 +84,18 @@ 
    {

      "name": "FunctionalTestsDesktopMode-fundamentals-CloseAllAppsWithBackNavigationTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-DragAppWindowMultiWindowAndPipTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-DragAppWindowSingleWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterDesktopFromSplitScreenWithAppHandleMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterDesktopWithAppHandleMenuExistingWindowsTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterDesktopWithAppHandleMenuTest"

    },
@@ -96,6 +105,9 @@ 
    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterSplitScreenWithAppHandleMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-EnterSplitScreenWithDragTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-ExitDesktopToFullScreenWithAppHeaderMenuTest"

    },
@@ -117,11 +129,14 @@ 
    {

      "name": "FunctionalTestsDesktopMode-fundamentals-SwitchFocusBetweenAppsTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-SwitchToHomeFromDesktopTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-SwitchToOverviewFromDesktopTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-SwitchToHomeFromDesktopTest"

      "name": "FunctionalTestsDesktopMode-fundamentals-TaskbarInDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-fundamentals-focus-ClickAndFocusTest"
@@ -156,6 +171,15 @@ 
    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-mediaprojection-StartAppMediaProjectionResizeAndDragTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-mediaprojection-StartAppMediaProjectionWithMaxDesktopWindowsTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-mediaprojection-StartScreenMediaProjectionWithMaxDesktopWindowsTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-minimize-MinimizeAppWindowsTest"

    },
@@ -191,6 +215,9 @@ 
    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-SnapResizeAppWindowWithKeyboardTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-tiling-TilingTest"

    }

  ]

}
 
 No newline at end of file

services/tests/wmtests/Android.bp

+245 −174

File changed.

Preview size limit exceeded, changes collapsed.