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

Commit 8beb3bce authored by CHIA-HSUAN HSU's avatar CHIA-HSUAN HSU
Browse files

Update missing tests in Android.bp and TEST_MAPPING 

Test: EXEMPT minor test refactoring
Flag: EXEMPT minor test refactoring
Bug: 436169790
Change-Id: I29f8c7b7e1fb5d740775bd392d78daef88e851fd
parent cf59af1a

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

+19 −0
Original line number Diff line number Diff line
@@ -64,10 +64,14 @@ test_module_config { 
        "com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest",

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

        "com.android.wm.shell.flicker.immersive.EnterImmersiveViaHeaderMenuFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.AltTabSwitchInDesktopModeFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.AltTabSwitchToUnminimizeInDesktopModeFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.EnterDesktopFromKeyboardShortcutFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.ExitDesktopToFullScreenWithKeyboardShortcutFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.MaximizeAppWithKeyboardFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.MinimizeAppsWithKeyboardFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.OpenAppFromAllAppsUsingKeyboardFlickerTest",

        "com.android.wm.shell.flicker.keyboardshortcuts.OpenBrowserWithKeyboardShortcutFlickerTest",

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

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

        "com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest",
@@ -92,6 +96,7 @@ test_module_config { 
        "com.android.wm.shell.flicker.tiling.TilingDividerShownAfterHomeSwipeFlickerTest",

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

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

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

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

    ],

}
@@ -243,6 +248,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.AltTabSwitchInDesktopModeFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-AltTabSwitchToUnminimizeInDesktopModeFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.AltTabSwitchToUnminimizeInDesktopModeFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -453,6 +465,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.tiling.TilingDividerShownHiddenFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-tiling-TilingPairBrokenWhenDraggingHeader",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.tiling.TilingPairBrokenWhenDraggingHeader"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-tiling-TilingPairBrokenWhenEnteringPipFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

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

+39 −24
Original line number Diff line number Diff line
@@ -63,35 +63,11 @@ android_test { 


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



test_module_config {

    name: "FunctionalTestsDesktopMode-AltTabSwitchInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-AltTabSwitchOutDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-AltTabSwitchToUnminimizeInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-CatchAll",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

    exclude_filters: [

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

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

        "com.android.wm.shell.functional.keyboardshortcuts.AltTabSwitchToUnminimizeInDesktopModeTest",

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

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

        "com.android.wm.shell.functional.DisableDisplayMirroringSwitchTest",
@@ -142,6 +118,9 @@ test_module_config { 
        "com.android.wm.shell.functional.fundamentals.focus.MoveToNextDisplayAndFocusTest",

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

        "com.android.wm.shell.functional.immersive.EnterImmersiveViaHeaderMenuTest",

        "com.android.wm.shell.functional.keyboardshortcuts.AltTabSwitchInDesktopModeTest",

        "com.android.wm.shell.functional.keyboardshortcuts.AltTabSwitchOutDesktopModeTest",

        "com.android.wm.shell.functional.keyboardshortcuts.AltTabSwitchToUnminimizeInDesktopModeTest",

        "com.android.wm.shell.functional.keyboardshortcuts.EnterDesktopFromKeyboardShortcutTest",

        "com.android.wm.shell.functional.keyboardshortcuts.ExitDesktopFromKeyboardShortcutTest",

        "com.android.wm.shell.functional.keyboardshortcuts.OpenAppFromAllAppsUsingKeyboardTest",
@@ -158,6 +137,7 @@ test_module_config { 
        "com.android.wm.shell.functional.resizing.ResizeAppCornerMultiWindowTest",

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

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

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

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

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

        "com.android.wm.shell.functional.resizing.SnapResizeAppWindowWithDragTest",
@@ -516,6 +496,27 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.immersive.EnterImmersiveViaHeaderMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-AltTabSwitchInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-AltTabSwitchOutDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-AltTabSwitchToUnminimizeInDesktopModeTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutTest",

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-OpenAppFromAllAppsUsingKeyboardTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutTest",

    base: "FunctionalTestsDesktopMode",
@@ -621,6 +629,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.resizing.ResizeAppWithEdgeResizeTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-RestartSizeCompatAppInDesktopMode",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ScaleDensityForExternalDisplayTest",

    base: "FunctionalTestsDesktopMode",

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

+12 −9
Original line number Diff line number Diff line
@@ -6,15 +6,6 @@ 
    }

  ],

  "wm": [

    {

      "name": "FunctionalTestsDesktopMode-AltTabSwitchInDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-AltTabSwitchOutDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-AltTabSwitchToUnminimizeInDesktopModeFlickerTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-CatchAll"

    },
@@ -168,6 +159,15 @@ 
    {

      "name": "FunctionalTestsDesktopMode-immersive-EnterImmersiveViaHeaderMenuTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-keyboardshortcuts-AltTabSwitchInDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-keyboardshortcuts-AltTabSwitchOutDesktopModeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-keyboardshortcuts-AltTabSwitchToUnminimizeInDesktopModeFlickerTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-keyboardshortcuts-EnterDesktopFromKeyboardShortcutTest"

    },
@@ -216,6 +216,9 @@ 
    {

      "name": "FunctionalTestsDesktopMode-resizing-ResizeAppWithEdgeResizeTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-RestartSizeCompatAppInDesktopMode"

    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-ScaleDensityForExternalDisplayTest"

    },

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/AltTabSwitchInDesktopModeTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/keyboardshortcuts/AltTabSwitchInDesktopModeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.functional

package com.android.wm.shell.functional.keyboardshortcuts



import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDesktopDevice

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/AltTabSwitchOutDesktopModeTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/keyboardshortcuts/AltTabSwitchOutDesktopModeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.functional

package com.android.wm.shell.functional.keyboardshortcuts



import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDesktopDevice