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

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

Move maximize test into /maximize subfolder and... 

Move maximize test into /maximize subfolder and EnterDesktopWithAppHandleMenuTest into /fundamentals subfolder

Test: USE_RBE=false atest WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.maximize.MaximizeAppFlickerTest -c (http://ab/I07200010415924556)
Test: USE_RBE=false atest WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.maximize.MaximizeAppNonResizableFlickerTest -c (http://ab/I48000010415923147)
Flag: EXEMPT minor test rafactoring
Bug: 418237090
Bug: 418206102
Bug: 418205309
Change-Id: Ifadc6ac933f69a13c040e4af00c83f494f991c85
parent 8c4482a7

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

+16 −8
Original line number Diff line number Diff line
@@ -51,13 +51,14 @@ test_module_config { 
        "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.MaximizeAppFlickerTest",

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

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

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

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

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

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

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

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

        "com.android.wm.shell.flicker.resizing.ResizeAppToMaximumWindowSizeFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppToMinimumWindowSizeFlickerTest",

        "com.android.wm.shell.flicker.resizing.ResizeAppWithCornerResizeFlickerTest",
@@ -127,13 +128,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-MaximizeAppFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",
@@ -176,6 +170,20 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.fundamentals.SwitchToHomeFromDesktopTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppNonResizableFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

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

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

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-ExitDesktopToSplitScreenWithAppHeaderMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-MaximizeAppFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-OpenAppFromAllAppsFlickerTest"

    },
@@ -42,6 +39,12 @@ 
    {

      "name": "WMShellFlickerTestsDesktopMode-fundamentals-SwitchToHomeFromDesktopTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppNonResizableFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest"

    },

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



import androidx.test.filters.RequiresDevice

import android.tools.NavBar

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

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

 */



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

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



import android.platform.test.annotations.RequiresDevice

import androidx.test.filters.RequiresDevice

import android.tools.NavBar

import android.tools.flicker.assertions.FlickerTest

import android.tools.flicker.junit.FlickerParametersRunnerFactory

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

+16 −16
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ test_module_config { 
        "com.android.wm.shell.functional.EnterDesktopViaMenuOfLiveOverviewTaskTest",

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

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

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

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

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

        "com.android.wm.shell.functional.EnterDesktopWithDragWindowsLimitTest",
@@ -126,16 +125,17 @@ test_module_config { 
        "com.android.wm.shell.functional.fundamentals.CloseAllAppsViaAppHeaderExitTest",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        "com.android.wm.shell.functional.resizing.ResizeAppWithCornerResizeTest",
@@ -203,13 +203,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.EnterDesktopViaStaticDesktopOverviewTaskTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-EnterDesktopWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-EnterDesktopWithDragExistingWindowsTest",

    base: "FunctionalTestsDesktopMode",
@@ -385,6 +378,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.EnterDesktopFromSplitScreenWithAppHandleMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterDesktopWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-EnterSplitScreenWithAppHandleMenuTest",

    base: "FunctionalTestsDesktopMode",
@@ -406,13 +406,6 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.fundamentals.ExitDesktopToSplitScreenWithAppHeaderMenuTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-MaximizeAppWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-fundamentals-OpenAppFromAllAppsTest",

    base: "FunctionalTestsDesktopMode",
@@ -462,6 +455,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.functional.resizing.ResizeAppCornerMultiWindowAndPipTest"],

}



test_module_config {

    name: "FunctionalTestsDesktopMode-maximize-MaximizeAppWindowTest",

    base: "FunctionalTestsDesktopMode",

    test_suites: ["device-tests"],

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

}



test_module_config {

    name: "FunctionalTestsDesktopMode-resizing-ResizeAppCornerMultiWindowTest",

    base: "FunctionalTestsDesktopMode",