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

Commit 2dd142be authored by CHIA-HSUAN HSU (xWF)'s avatar CHIA-HSUAN HSU (xWF) Committed by Android (Google) Code Review
Browse files

Merge changes I29f8c7b7,Ib8de6164 into main 

* changes:
  Update missing tests in Android.bp and TEST_MAPPING
  Move Exit* tests into /exit subfolder
parents 35c6902c 8beb3bce

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

+43 −24
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ test_module_config { 
    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    exclude_filters: [

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

        "com.android.wm.shell.flicker.exit.ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest",

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

        "com.android.wm.shell.flicker.externaldisplay.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest",

        "com.android.wm.shell.flicker.externaldisplay.OpenAppWithExternalDisplayConnectedFlickerTest",

        "com.android.wm.shell.flicker.fundamentals.CloseAllAppsViaAppHeaderExitTest",
@@ -52,8 +55,6 @@ test_module_config { 
        "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",

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

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

        "com.android.wm.shell.flicker.fundamentals.OpenAppsInDesktopModeFlickerTest",
@@ -63,11 +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.maximize.ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest",

        "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,10 +96,32 @@ 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",

    ],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-exit-ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.exit.ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-exit-ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.exit.ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-exit-ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.exit.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-externaldisplay-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -152,20 +178,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.EnterSplitScreenWithAppHandleMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -236,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",
@@ -278,13 +297,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.keyboardshortcuts.OpenBrowserWithKeyboardShortcutFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppDoubleTapAppHeaderFlickerTest",

    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/flicker-service/src/com/android/wm/shell/flicker/fundamentals/ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/exit/ExitDesktopToFullScreenWithAppHeaderMenuFlickerTest.kt

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

 */



package com.android.wm.shell.flicker.fundamentals

package com.android.wm.shell.flicker.exit



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/maximize/ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/exit/ExitDesktopToFullScreenWithDragToTopDragZoneFlickerTest.kt

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

 */



package com.android.wm.shell.flicker.maximize

package com.android.wm.shell.flicker.exit



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/fundamentals/ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/exit/ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest.kt

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

 */



package com.android.wm.shell.flicker.fundamentals

package com.android.wm.shell.flicker.exit



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice

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

+60 −45
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",
@@ -112,6 +88,9 @@ test_module_config { 
        "com.android.wm.shell.functional.UnmaximizeAppWindowTest",

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

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

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

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

        "com.android.wm.shell.functional.exit.ExitDesktopWithDragToTopDragZoneTest",

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

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

        "com.android.wm.shell.functional.fundamentals.CloseAllAppsViaAppHeaderExitTest",
@@ -124,8 +103,6 @@ test_module_config { 
        "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",

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

        "com.android.wm.shell.functional.fundamentals.OpenAppsInDesktopModeTest",
@@ -141,11 +118,13 @@ 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",

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

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

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

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

        "com.android.wm.shell.functional.mediaprojection.StartAppMediaProjectionWithMaxDesktopWindowsTest",
@@ -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",
@@ -306,6 +286,27 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.UnminimizeAppFromTaskbarTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-exit-ExitDesktopToFullScreenWithAppHeaderMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-exit-ExitDesktopToSplitScreenWithAppHeaderMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-exit-ExitDesktopWithDragToTopDragZoneTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-externaldisplay-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

    base: "FunctionalTestsDesktopMode",
@@ -390,20 +391,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterSplitScreenWithDragTest"],

}



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

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-OpenAppFromAllAppsTest",

    base: "FunctionalTestsDesktopMode",
@@ -509,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",
@@ -524,17 +532,17 @@ test_module_config { 
}



test_module_config {

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutTest",

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-OpenAppFromAllAppsUsingKeyboardTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-ExitDesktopWithDragToTopDragZoneTest",

    name: "FunctionalTestsDesktopMode-keyboardshortcuts-OpenBrowserWithKeyboardShortcutTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

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

}



test_module_config {
@@ -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",