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

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

b/432194569 and b/418215459 Migrate MinimizeAutoPipAppWindow to flicker test 

Test: USE_RBE=false atest WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.minimize.MinimizeAutoPipAppWindowFlickerTest -c (http://ab/I50400010425073588)
Video: http://recall/-/cHobd8dOLjIC11uSEiFgCV
Flag: EXEMPT migrate flicker test
Bug: 432194569
Bug: 418215459
Change-Id: Ica49e68e27e78ab76a9af70faf3c17d290b06b0a
parent d4fca214

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

+8 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 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.minimize.MinimizeAutoPipAppWindowFlickerTest",

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

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

        "com.android.wm.shell.flicker.resizing.ResizeAppWithCornerResizeFlickerTest",
@@ -255,6 +256,13 @@ test_module_config { 
    include_filters: ["com.android.wm.shell.flicker.maximize.MaximizeAppViaHeaderMenuFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-minimize-MinimizeAutoPipAppWindowFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

    test_suites: ["device-tests"],

    include_filters: ["com.android.wm.shell.flicker.minimize.MinimizeAutoPipAppWindowFlickerTest"],

}



test_module_config {

    name: "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest",

    base: "WMShellFlickerTestsDesktopMode",

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

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

      "name": "WMShellFlickerTestsDesktopMode-maximize-MaximizeAppViaHeaderMenuFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-minimize-MinimizeAutoPipAppWindowFlickerTest"

    },

    {

      "name": "WMShellFlickerTestsDesktopMode-resizing-ResizeAppToMaximumWindowSizeFlickerTest"

    },

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MinimizeAutoPipAppWindow.kt

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.flicker



import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MINIMIZE_AUTO_PIP_APP

import com.android.wm.shell.scenarios.MinimizeAutoPipAppWindow

import org.junit.Test

import org.junit.runner.RunWith



@RequiresDevice

@RunWith(FlickerServiceJUnit4ClassRunner::class)

class MinimizeAutoPipAppWindow : MinimizeAutoPipAppWindow() {

    @ExpectedScenarios(["MINIMIZE_AUTO_PIP_APP"])

    @Test

    override fun minimizePipAppWindow() = super.minimizePipAppWindow()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MINIMIZE_AUTO_PIP_APP)

    }

}

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/minimize/MinimizeAutoPipAppWindowFlickerTest.kt

0 → 100644
+84 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.wm.shell.flicker.minimize



import androidx.test.filters.RequiresDevice

import android.tools.NavBar

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.FlickerBuilder

import android.tools.flicker.FlickerTest

import android.tools.flicker.FlickerTestFactory

import com.android.wm.shell.flicker.DesktopModeBaseTest

import com.android.wm.shell.scenarios.MinimizeAutoPipAppWindow

import com.android.wm.shell.Utils

import com.android.wm.shell.flicker.utils.appWindowBecomesPinned

import com.android.wm.shell.flicker.utils.appWindowKeepVisible

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized



/**

 * Open an app in desktop mode, launch an app that can go into

 * PiP, minimize app and ensure that app goes into PiP mode automatically.

 */



@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

class MinimizeAutoPipAppWindowFlickerTest(flicker: FlickerTest) : DesktopModeBaseTest(flicker) {

    inner class MinimizeAutoPipAppWindowScenario :

        MinimizeAutoPipAppWindow(flicker.scenario.startRotation)



    @Rule

    @JvmField

    val testSetupRule =

        Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)

    val scenario = MinimizeAutoPipAppWindowScenario()

    private val pipAppDesktopMode = scenario.pipAppDesktopMode

    private val appInDesktop = scenario.appInDesktop



    override val transition: FlickerBuilder.() -> Unit

        get() = {

            setup {

                scenario.setup()

            }

            transitions {

                scenario.minimizePipAppWindow()

            }

            teardown {

                scenario.teardown()

            }

        }



    @Test

    fun appWindowBecomesPinned() = flicker.appWindowBecomesPinned(pipAppDesktopMode)



    @Test

    fun appWindowKeepVisible() = appInDesktop.forEach { flicker.appWindowKeepVisible(it) }



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerChecker> {

            return FlickerTestFactory.nonRotationTests(

                supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)

            )

        }

    }

}

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/MinimizeAutoPipAppWindow.kt

+9 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.scenarios



import android.app.Instrumentation

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.uiautomator.UiDevice
@@ -32,21 +33,27 @@ import org.junit.Test 


/** Base scenario test for minimizing the app entering pip on leave automatically */

@Ignore("Test Base Class")

abstract class MinimizeAutoPipAppWindow : TestScenarioBase() {

abstract class MinimizeAutoPipAppWindow(

    val rotation: Rotation = Rotation.ROTATION_0

) : TestScenarioBase(rotation) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    private val pipApp = PipAppHelper(instrumentation)

    private val pipAppDesktopMode = DesktopModeAppHelper(pipApp)

    val pipAppDesktopMode = DesktopModeAppHelper(pipApp)



    val appInDesktop: ArrayList<DesktopModeAppHelper> = ArrayList()



    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableMinimizeButton())

        Assume.assumeTrue(com.android.wm.shell.Flags.enablePip2())

        testApp.enterDesktopMode(wmHelper, device)

        appInDesktop.add(testApp)

        pipApp.launchViaIntent(wmHelper)

        pipApp.enableAutoEnterForPipActivity()

        appInDesktop.add(pipAppDesktopMode)

    }



    @Test