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

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

Merge "Update test_module_configs for Flicker and Shell E2e tests" into main

parents 5b1e226d 02a1f347

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

+12 −11
Original line number Diff line number Diff line
@@ -47,59 +47,60 @@ android_test { 
    ],

}



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

// Begin breakdowns for WMShellExplicitFlickerTestsBubbles module

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



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-CatchAll",

    base: "WMShellExplicitFlickerTestsBubbles",

    test_suites: ["device-tests"],

    exclude_filters: [

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

        "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.EnterBubbleWithImeViaBubbleMenuTest",

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

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

    ],

    test_suites: ["device-tests"],

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-CollapseBubbleViaBackTest",

    name: "WMShellExplicitFlickerTestsBubbles-CollapseBubbleAppViaBackTest",

    base: "WMShellExplicitFlickerTestsBubbles",

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

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleViewTest",

    base: "WMShellExplicitFlickerTestsBubbles",

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

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleViaBubbleMenuTest",

    base: "WMShellExplicitFlickerTestsBubbles",

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

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-EnterBubbleWithImeViaBubbleMenuTest",

    base: "WMShellExplicitFlickerTestsBubbles",

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

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-ExpandBubbleViaBubbleStackTest",

    base: "WMShellExplicitFlickerTestsBubbles",

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

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellExplicitFlickerTestsBubbles-ExpandBubbleWithImeViaBubbleBarTest",

    base: "WMShellExplicitFlickerTestsBubbles",

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

    test_suites: ["device-tests"],

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

}

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
      "name": "WMShellExplicitFlickerTestsBubbles-CatchAll"

    },

    {

      "name": "WMShellExplicitFlickerTestsBubbles-CollapseBubbleViaBackTest"

      "name": "WMShellExplicitFlickerTestsBubbles-CollapseBubbleAppViaBackTest"

    },

    {

      "name": "WMShellExplicitFlickerTestsBubbles-DismissExpandedBubbleViaBubbleViewTest"

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

+24 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.CloseAllAppsWithBackNavigationTest",

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

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

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

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

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

        "com.android.wm.shell.flicker.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest",
@@ -57,8 +58,10 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.QuickSwitchBetweenDesktopAndFullscreenTest",

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

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

        "com.android.wm.shell.flicker.maximize.MaximizeAppDoubleTapAppHeaderFlickerTest",

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

        "com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest",

        "com.android.wm.shell.flicker.maximize.MaximizeAppViaHeaderMenuFlickerTest",

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

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

        "com.android.wm.shell.flicker.resizing.ResizeAppWithCornerResizeFlickerTest",
@@ -107,6 +110,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.EnterDesktopWithAppHandleMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopWithDragFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-EnterSplitScreenWithAppHandleMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -170,6 +180,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppDoubleTapAppHeaderFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppDoubleTapAppHeaderFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -184,6 +201,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppViaHeaderMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppViaHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

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

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopWithAppHandleMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-EnterDesktopWithDragFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-EnterSplitScreenWithAppHandleMenuFlickerTest"

    },
@@ -39,12 +42,18 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-SwitchToHomeFromDesktopTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppDoubleTapAppHeaderFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppNonResizableFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppViaHeaderMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest"

    },

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

+42 −2
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ test_module_config { 
        "com.android.wm.shell.functional.fundamentals.QuickSwitchBetweenDesktopAndFullscreenTest",

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

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

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

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

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

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

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

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

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

        "com.android.wm.shell.functional.resizing.ResizeAppCornerMultiWindowTest",
@@ -449,10 +454,38 @@ test_module_config { 
}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest",

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

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

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

}



test_module_config {

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

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

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

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

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

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

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

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {
@@ -462,6 +495,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.maximize.MaximizeAppWindowTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowTest",

    base: "FunctionalTestsDesktopMode",