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

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

Move Exit* tests into /exit subfolder 

Test: EXEMPT minor test refactoring
Flag: EXEMPT minor test refactoring
Bug: 435960803
Change-Id: Ib8de6164976998c757b209c8dd4a97fabad1a79b
parent 5c95e357

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

+24 −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",
@@ -67,7 +68,6 @@ test_module_config { 
        "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.maximize.MaximizeAppDoubleTapAppHeaderFlickerTest",

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

        "com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest",
@@ -96,6 +96,27 @@ test_module_config { 
    ],

}



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 +173,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",
@@ -278,13 +285,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",

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

+24 −24
Original line number Diff line number Diff line
@@ -112,6 +112,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 +127,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",
@@ -145,7 +146,6 @@ test_module_config { 
        "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",
@@ -306,6 +306,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 +411,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",
@@ -530,13 +537,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.keyboardshortcuts.OpenBrowserWithKeyboardShortcutTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-ExitDesktopWithDragToTopDragZoneTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowTest",

    base: "FunctionalTestsDesktopMode",