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

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

Move MaximizeAppWindowWithDragToTopDragZoneInDesktopFirst into /externaldisplay subfolder 

Test: EXEMPT minor test refactoring
Flag: EXEMPT minor test refactoring
Bug: 433605745
Change-Id: I1708a0f69458430bc87ffb119c8fc000bbaf36bc
parent 0be367a1

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

+8 −8
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ test_module_config { 
    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    exclude_filters: [

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

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

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

        "com.android.wm.shell.flicker.fundamentals.CloseAllAppsWithBackNavigationTest",
@@ -69,7 +70,6 @@ test_module_config { 
        "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.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest",

        "com.android.wm.shell.flicker.minimize.MinimizeAppsFlickerTest",

        "com.android.wm.shell.flicker.minimize.MinimizeAutoPipAppWindowFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppToMaximumWindowSizeFlickerTest",
@@ -92,6 +92,13 @@ test_module_config { 
    ],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-externaldisplay-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.externaldisplay.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-externaldisplay-OpenAppWithExternalDisplayConnectedFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -281,13 +288,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppViaHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-minimize-MinimizeAppsFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

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

+3 −3
Original line number Diff line number Diff line 
{

  "wm": [

    {

      "name": "WMShellFlickerTestsDesktopMode-externaldisplay-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-externaldisplay-OpenAppWithExternalDisplayConnectedFlickerTest"

    },
@@ -81,9 +84,6 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppViaHeaderMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-minimize-MinimizeAppsFlickerTest"

    },

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

+3 −3
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.externaldisplay



import androidx.test.filters.RequiresDevice

import android.tools.NavBar
@@ -35,8 +35,8 @@ import org.junit.runner.RunWith 
import org.junit.runners.Parameterized



/**

 * Maximize app window by dragging it to the top drag zone in desktop-first display.

 *

 * Maximize app window by dragging it to the top drag zone in desktop-first display when an

 * external display is connected.

 * Test with 3 button navigation because the expected bottom inset of the stable bounds is higher

 * than actual.

 *

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

+8 −8
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 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.externaldisplay.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

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

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

        "com.android.wm.shell.functional.fundamentals.CloseAllAppsWithBackNavigationTest",
@@ -143,7 +144,6 @@ test_module_config { 
        "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.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

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

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

        "com.android.wm.shell.functional.mediaprojection.StartScreenMediaProjectionWithMaxDesktopWindowsTest",
@@ -303,6 +303,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.UnminimizeAppFromTaskbarTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-externaldisplay-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-externaldisplay-OpenAppWithExternalDisplayConnectedTest",

    base: "FunctionalTestsDesktopMode",
@@ -520,13 +527,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.maximize.MaximizeAppWindowTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-mediaprojection-StartAppMediaProjectionResizeAndDragTest",

    base: "FunctionalTestsDesktopMode",

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

+3 −3
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ 
    {

      "name": "FunctionalTestsDesktopMode-UnminimizeAppFromTaskbarTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-externaldisplay-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-externaldisplay-OpenAppWithExternalDisplayConnectedTest"

    },
@@ -171,9 +174,6 @@ 
    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-mediaprojection-StartAppMediaProjectionResizeAndDragTest"

    },