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

Commit 820dec16 authored by CHIA-HSUAN HSU's avatar CHIA-HSUAN HSU Committed by CHIA-HSUAN HSU (xWF)
Browse files

Move Minimize* functional tests into /minimize subfolder 

Test: EXEMPT minor test refactoring
Flag: EXEMPT minor test refactoring
Bug: 432637256
Change-Id: I84352501701f9c9de7b626962a1a3f1db85daac0
parent 863e2182

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

+24 −24
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ test_module_config { 
        "com.android.wm.shell.functional.EnterDesktopWithDragWindowsLimitTest",

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

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

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

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

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

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

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

        "com.android.wm.shell.functional.OpenTrampolineAppInDesktopModeTaskLimitTest",
@@ -134,6 +131,9 @@ test_module_config { 
        "com.android.wm.shell.functional.maximize.MaximizeAppWindowTest",

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

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

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

        "com.android.wm.shell.functional.minimize.MinimizeWindowOnAppOpenTest",

        "com.android.wm.shell.functional.minimize.MinimizeWindowOnAppOpenViaIntentTest",

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

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

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MinimizeAutoPipAppWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MinimizeWindowOnAppOpenTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MinimizeWindowOnAppOpenViaIntentTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-MoveToNextDisplayTest",

    base: "FunctionalTestsDesktopMode",
@@ -495,6 +474,27 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.minimize.MinimizeAppWindowsTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-minimize-MinimizeAutoPipAppWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-minimize-MinimizeWindowOnAppOpenTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-minimize-MinimizeWindowOnAppOpenViaIntentTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest",

    base: "FunctionalTestsDesktopMode",

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

+9 −9
Original line number Diff line number Diff line
@@ -51,15 +51,6 @@ 
    {

      "name": "FunctionalTestsDesktopMode-FocusAppFromTaskbarTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MinimizeAutoPipAppWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MinimizeWindowOnAppOpenTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MinimizeWindowOnAppOpenViaIntentTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-MoveToNextDisplayTest"

    },
@@ -165,6 +156,15 @@ 
    {

      "name": "FunctionalTestsDesktopMode-minimize-MinimizeAppWindowsTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-minimize-MinimizeAutoPipAppWindowTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-minimize-MinimizeWindowOnAppOpenTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-minimize-MinimizeWindowOnAppOpenViaIntentTest"

    },

    {

      "name": "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowAndPipTest"

    },

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



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



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



import android.platform.test.annotations.Presubmit

import android.platform.test.rule.ScreenRecordRule