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

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

Merge "Move Maximize* functional tests into /maximize subfolder" into main

parents 503a5448 a5fb0c1b

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

+16 −16
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ test_module_config { 
        "com.android.wm.shell.functional.ExitDesktopWithDragToTopDragZoneTest",

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

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

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

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

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

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

        "com.android.wm.shell.functional.MinimizeWindowOnAppOpenTest",
@@ -134,6 +132,8 @@ test_module_config { 
        "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.maximize.MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

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

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

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

        "com.android.wm.shell.functional.resizing.ResizeAppWithCornerResizeTest",
@@ -236,20 +236,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.FocusAppFromTaskbarTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MaximizeAppWindowWithDragToTopDragZoneTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MinimizeAppWindowsTest",

    base: "FunctionalTestsDesktopMode",
@@ -495,6 +481,20 @@ 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-maximize-MaximizeAppWindowWithDragToTopDragZoneTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest",

    base: "FunctionalTestsDesktopMode",

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

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

      "name": "FunctionalTestsDesktopMode-FocusAppFromTaskbarTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MaximizeAppWindowWithDragToTopDragZoneTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MinimizeAppWindowsTest"

    },
@@ -165,6 +159,12 @@ 
    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowWithDragToTopDragZoneTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest"

    },

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/maximize/MaximizeAppWindowWithDragToTopDragZoneInDesktopFirstTest.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.maximize



import android.platform.test.annotations.Presubmit

import android.platform.test.rule.ScreenRecordRule

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/MaximizeAppWindowWithDragToTopDragZoneTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/maximize/MaximizeAppWindowWithDragToTopDragZoneTest.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.maximize



import android.platform.test.annotations.Presubmit

import android.platform.test.rule.ScreenRecordRule