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

Commit ef6d60a3 authored by Chilun Huang's avatar Chilun Huang
Browse files

Add CUJ for quick switch to split pair from another app 

Add CUJ for quick switch to split pair from another app.

Bug: 231399964
Test: atest WMShellFlickerTests:SwitchBackToSplitFromAnotherApp
Change-Id: I5b557970fc8bd3a55fec8574287f903ad78ad2dd
parent 2611ae2b

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromAnotherApp.kt

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

 * Copyright (C) 2022 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.splitscreen



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group1

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.wm.shell.flicker.appWindowBecomesVisible

import com.android.wm.shell.flicker.helpers.SplitScreenHelper

import com.android.wm.shell.flicker.layerBecomesVisible

import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd

import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible

import org.junit.Assume

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



/**

 * Test quick switch to split pair from another app.

 *

 * To run this test: `atest WMShellFlickerTests:SwitchBackToSplitFromAnotherApp`

 */

@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group1

class SwitchBackToSplitFromAnotherApp(testSpec: FlickerTestParameter) : SplitScreenBase(testSpec) {

    val thirdApp = SplitScreenHelper.getNonResizeable(instrumentation)



    // TODO(b/231399940): Remove this once we can use recent shortcut to enter split.

    @Before

    open fun before() {

        Assume.assumeTrue(tapl.isTablet)

    }



    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)

            setup {

                eachRun {

                    primaryApp.launchViaIntent(wmHelper)

                    // TODO(b/231399940): Use recent shortcut to enter split.

                    tapl.launchedAppState.taskbar

                        .openAllApps()

                        .getAppIcon(secondaryApp.appName)

                        .dragToSplitscreen(secondaryApp.`package`, primaryApp.`package`)

                    SplitScreenHelper.waitForSplitComplete(wmHelper, primaryApp, secondaryApp)



                    thirdApp.launchViaIntent(wmHelper)

                    wmHelper.StateSyncBuilder()

                        .withAppTransitionIdle()

                        .withWindowSurfaceAppeared(thirdApp)

                        .waitForAndVerify()

                }

            }

            transitions {

                tapl.launchedAppState.quickSwitchToPreviousApp()

                SplitScreenHelper.waitForSplitComplete(wmHelper, primaryApp, secondaryApp)

            }

        }



    @Presubmit

    @Test

    fun splitScreenDividerBecomesVisible() = testSpec.splitScreenDividerBecomesVisible()



    @Presubmit

    @Test

    fun primaryAppLayerBecomesVisible() = testSpec.layerBecomesVisible(primaryApp)



    @Presubmit

    @Test

    fun secondaryAppLayerBecomesVisible() = testSpec.layerBecomesVisible(secondaryApp)



    @Presubmit

    @Test

    fun primaryAppBoundsIsVisibleAtEnd() = testSpec.splitAppLayerBoundsIsVisibleAtEnd(

        primaryApp, splitLeftTop = false)



    @Presubmit

    @Test

    fun secondaryAppBoundsIsVisibleAtEnd() = testSpec.splitAppLayerBoundsIsVisibleAtEnd(

        secondaryApp, splitLeftTop = true)



    @Presubmit

    @Test

    fun primaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(primaryApp)



    @Presubmit

    @Test

    fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun entireScreenCovered() =

        super.entireScreenCovered()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerIsVisibleAtStartAndEnd() =

        super.navBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() =

        super.navBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() =

        super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() =

        super.statusBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() =

        super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() =

        super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    companion object {

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

        @JvmStatic

        fun getParams(): List<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests(

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                // TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.

                supportedNavigationModes =

                    listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY))

        }

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromHome.kt

+24 −26
Original line number Diff line number Diff line
@@ -26,10 +26,8 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.annotation.Group1

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.wm.shell.flicker.appWindowBecomesVisible

import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd

import com.android.wm.shell.flicker.helpers.SplitScreenHelper

import com.android.wm.shell.flicker.layerBecomesVisible

import com.android.wm.shell.flicker.layerIsVisibleAtEnd

import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd

import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible

import org.junit.Assume
@@ -41,7 +39,7 @@ import org.junit.runners.MethodSorters 
import org.junit.runners.Parameterized



/**

 * Test switch back to split pair after go home

 * Test quick switch to split pair from home.

 *

 * To run this test: `atest WMShellFlickerTests:SwitchBackToSplitFromHome`

 */
@@ -90,7 +88,7 @@ class SwitchBackToSplitFromHome(testSpec: FlickerTestParameter) : SplitScreenBas 


    @Presubmit

    @Test

    fun primaryAppLayerIsVisibleAtEnd() = testSpec.layerIsVisibleAtEnd(primaryApp)

    fun primaryAppLayerBecomesVisible() = testSpec.layerBecomesVisible(primaryApp)



    @Presubmit

    @Test
@@ -108,7 +106,7 @@ class SwitchBackToSplitFromHome(testSpec: FlickerTestParameter) : SplitScreenBas 


    @Presubmit

    @Test

    fun primaryAppWindowIsVisibleAtEnd() = testSpec.appWindowIsVisibleAtEnd(primaryApp)

    fun primaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(primaryApp)



    @Presubmit

    @Test