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

Commit 81db2a07 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Add closeAllApps scenario and refactor 

- Add new test to close multiple apps in desktop mode.
- Refactor flicker scenarios into their own class to avoid duplication.
- Replace DesktopModeUtils with DesktopModeAppHelper wrapper.

Test: atest com.android.wm.shell.flicker.service.desktopmode.flicker
Bug: 316318390
Change-Id: I60f37fb507850daddc3cb91529c272e9f0dbbb44
parent e9093b4f

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/CloseAllAppWithAppHeaderExitLandscape.kt

0 → 100644
+47 −0
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.service.desktopmode.flicker



import android.tools.Rotation

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 com.android.wm.shell.flicker.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_APP

import com.android.wm.shell.flicker.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_LAST_APP

import com.android.wm.shell.flicker.service.desktopmode.scenarios.CloseAllAppsWithAppHeaderExit

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CloseAllAppWithAppHeaderExitLandscape : CloseAllAppsWithAppHeaderExit(Rotation.ROTATION_90) {

    @ExpectedScenarios(["CLOSE_APP", "CLOSE_LAST_APP"])

    @Test

    override fun closeAllAppsInDesktop() = super.closeAllAppsInDesktop()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig()

                .use(FlickerServiceConfig.DEFAULT)

                .use(CLOSE_APP)

                .use(CLOSE_LAST_APP)

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/CloseAllAppWithAppHeaderExitPortrait.kt

0 → 100644
+47 −0
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.service.desktopmode.flicker



import android.tools.Rotation

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 com.android.wm.shell.flicker.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_APP

import com.android.wm.shell.flicker.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.CLOSE_LAST_APP

import com.android.wm.shell.flicker.service.desktopmode.scenarios.CloseAllAppsWithAppHeaderExit

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class CloseAllAppWithAppHeaderExitPortrait : CloseAllAppsWithAppHeaderExit(Rotation.ROTATION_0) {

    @ExpectedScenarios(["CLOSE_APP", "CLOSE_LAST_APP"])

    @Test

    override fun closeAllAppsInDesktop() = super.closeAllAppsInDesktop()



    companion object {

        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig()

                .use(FlickerServiceConfig.DEFAULT)

                .use(CLOSE_APP)

                .use(CLOSE_LAST_APP)

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/DesktopModeFlickerScenarios.kt

0 → 100644
+118 −0
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.service.desktopmode.flicker



import android.tools.flicker.AssertionInvocationGroup

import android.tools.flicker.assertors.assertions.AppLayerIsInvisibleAtEnd

import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAlways

import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAtStart

import android.tools.flicker.assertors.assertions.AppWindowHasDesktopModeInitialBoundsAtTheEnd

import android.tools.flicker.assertors.assertions.AppWindowOnTopAtEnd

import android.tools.flicker.assertors.assertions.AppWindowOnTopAtStart

import android.tools.flicker.assertors.assertions.LauncherWindowMovesToTop

import android.tools.flicker.config.AssertionTemplates

import android.tools.flicker.config.FlickerConfigEntry

import android.tools.flicker.config.ScenarioId

import android.tools.flicker.config.desktopmode.Components

import android.tools.flicker.extractors.ITransitionMatcher

import android.tools.flicker.extractors.ShellTransitionScenarioExtractor

import android.tools.traces.wm.Transition

import android.tools.traces.wm.TransitionType



class DesktopModeFlickerScenarios {

    companion object {

        val END_DRAG_TO_DESKTOP =

            FlickerConfigEntry(

                scenarioId = ScenarioId("END_DRAG_TO_DESKTOP"),

                extractor =

                    ShellTransitionScenarioExtractor(

                        transitionMatcher =

                            object : ITransitionMatcher {

                                override fun findAll(

                                    transitions: Collection<Transition>

                                ): Collection<Transition> {

                                    return transitions.filter {

                                        it.type == TransitionType.DESKTOP_MODE_END_DRAG_TO_DESKTOP

                                    }

                                }

                            }

                    ),

                assertions =

                    AssertionTemplates.COMMON_ASSERTIONS +

                        listOf(

                                AppLayerIsVisibleAlways(Components.DESKTOP_MODE_APP),

                                AppWindowOnTopAtEnd(Components.DESKTOP_MODE_APP),

                                AppWindowHasDesktopModeInitialBoundsAtTheEnd(

                                    Components.DESKTOP_MODE_APP

                                )

                            )

                            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

            )



        val CLOSE_APP =

            FlickerConfigEntry(

                scenarioId = ScenarioId("CLOSE_APP"),

                extractor =

                    ShellTransitionScenarioExtractor(

                        transitionMatcher =

                            object : ITransitionMatcher {

                                override fun findAll(

                                    transitions: Collection<Transition>

                                ): Collection<Transition> {

                                    return transitions.filter { it.type == TransitionType.CLOSE }

                                }

                            }

                    ),

                assertions =

                    AssertionTemplates.COMMON_ASSERTIONS +

                        listOf(

                                AppWindowOnTopAtStart(Components.DESKTOP_MODE_APP),

                                AppLayerIsVisibleAtStart(Components.DESKTOP_MODE_APP),

                                AppLayerIsInvisibleAtEnd(Components.DESKTOP_MODE_APP),

                            )

                            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

            )



        val CLOSE_LAST_APP =

            FlickerConfigEntry(

                scenarioId = ScenarioId("CLOSE_LAST_APP"),

                extractor =

                    ShellTransitionScenarioExtractor(

                        transitionMatcher =

                            object : ITransitionMatcher {

                                override fun findAll(

                                    transitions: Collection<Transition>

                                ): Collection<Transition> {

                                    val lastTransition =

                                        transitions.findLast { it.type == TransitionType.CLOSE }

                                    return if (lastTransition != null) listOf(lastTransition)

                                    else emptyList()

                                }

                            }

                    ),

                assertions =

                    AssertionTemplates.COMMON_ASSERTIONS +

                        listOf(

                                AppWindowOnTopAtStart(Components.DESKTOP_MODE_APP),

                                AppLayerIsVisibleAtStart(Components.DESKTOP_MODE_APP),

                                AppLayerIsInvisibleAtEnd(Components.DESKTOP_MODE_APP),

                                LauncherWindowMovesToTop()

                            )

                            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

            )

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/EnterDesktopWithDragLandscape.kt

+5 −35
Original line number Diff line number Diff line
@@ -17,58 +17,28 @@ 
package com.android.wm.shell.flicker.service.desktopmode.flicker



import android.tools.Rotation

import android.tools.flicker.AssertionInvocationGroup

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAlways

import android.tools.flicker.assertors.assertions.AppWindowHasDesktopModeInitialBoundsAtTheEnd

import android.tools.flicker.assertors.assertions.AppWindowOnTopAtEnd

import android.tools.flicker.config.AssertionTemplates

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerConfigEntry

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.config.ScenarioId

import android.tools.flicker.config.desktopmode.Components

import android.tools.flicker.extractors.ITransitionMatcher

import android.tools.flicker.extractors.ShellTransitionScenarioExtractor

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import android.tools.traces.wm.Transition

import android.tools.traces.wm.TransitionType

import com.android.wm.shell.flicker.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.END_DRAG_TO_DESKTOP

import com.android.wm.shell.flicker.service.desktopmode.scenarios.EnterDesktopWithDrag

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class EnterDesktopWithDragLandscape : EnterDesktopWithDrag(Rotation.ROTATION_90) {

    @ExpectedScenarios(["END_DRAG_TO_DESKTOP"]) @Test override fun enterDesktopWithDrag() =

        super.enterDesktopWithDrag()

    @ExpectedScenarios(["END_DRAG_TO_DESKTOP"])

    @Test

    override fun enterDesktopWithDrag() = super.enterDesktopWithDrag()



    companion object {

        private val END_DRAG_TO_DESKTOP = FlickerConfigEntry(

            scenarioId = ScenarioId("END_DRAG_TO_DESKTOP"),

            extractor = ShellTransitionScenarioExtractor(

                transitionMatcher = object : ITransitionMatcher {

                    override fun findAll(

                        transitions: Collection<Transition>

                    ): Collection<Transition> {

                        return transitions.filter {

                            it.type == TransitionType.DESKTOP_MODE_END_DRAG_TO_DESKTOP}

                    }

                }),

            assertions = AssertionTemplates.COMMON_ASSERTIONS +

                    listOf(

                        AppLayerIsVisibleAlways(Components.DESKTOP_MODE_APP),

                        AppWindowOnTopAtEnd(Components.DESKTOP_MODE_APP),

                        AppWindowHasDesktopModeInitialBoundsAtTheEnd(Components.DESKTOP_MODE_APP)

                    ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

        )



        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig()

                    .use(FlickerServiceConfig.DEFAULT)

                    .use(END_DRAG_TO_DESKTOP)

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(END_DRAG_TO_DESKTOP)

    }

}

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/EnterDesktopWithDragPortrait.kt

+5 −36
Original line number Diff line number Diff line
@@ -17,58 +17,27 @@ 
package com.android.wm.shell.flicker.service.desktopmode.flicker



import android.tools.Rotation

import android.tools.flicker.AssertionInvocationGroup

import android.tools.flicker.FlickerConfig

import android.tools.flicker.annotation.ExpectedScenarios

import android.tools.flicker.annotation.FlickerConfigProvider

import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAlways

import android.tools.flicker.assertors.assertions.AppWindowHasDesktopModeInitialBoundsAtTheEnd

import android.tools.flicker.assertors.assertions.AppWindowOnTopAtEnd

import android.tools.flicker.config.AssertionTemplates

import android.tools.flicker.config.FlickerConfig

import android.tools.flicker.config.FlickerConfigEntry

import android.tools.flicker.config.FlickerServiceConfig

import android.tools.flicker.config.ScenarioId

import android.tools.flicker.config.desktopmode.Components

import android.tools.flicker.extractors.ITransitionMatcher

import android.tools.flicker.extractors.ShellTransitionScenarioExtractor

import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner

import android.tools.traces.wm.Transition

import android.tools.traces.wm.TransitionType

import com.android.wm.shell.flicker.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.END_DRAG_TO_DESKTOP

import com.android.wm.shell.flicker.service.desktopmode.scenarios.EnterDesktopWithDrag

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(FlickerServiceJUnit4ClassRunner::class)

class EnterDesktopWithDragPortrait : EnterDesktopWithDrag(Rotation.ROTATION_0) {

    @ExpectedScenarios(["END_DRAG_TO_DESKTOP"]) @Test override fun enterDesktopWithDrag() =

        super.enterDesktopWithDrag()

    @ExpectedScenarios(["END_DRAG_TO_DESKTOP"])

    @Test

    override fun enterDesktopWithDrag() = super.enterDesktopWithDrag()



    companion object {

        private val END_DRAG_TO_DESKTOP = FlickerConfigEntry(

            scenarioId = ScenarioId("END_DRAG_TO_DESKTOP"),

            extractor = ShellTransitionScenarioExtractor(

                transitionMatcher = object : ITransitionMatcher {

                    override fun findAll(

                        transitions: Collection<Transition>

                    ): Collection<Transition> {

                        return transitions.filter {

                            it.type == TransitionType.DESKTOP_MODE_END_DRAG_TO_DESKTOP}

                    }

                }),

            assertions = AssertionTemplates.COMMON_ASSERTIONS +

                    listOf(

                        AppLayerIsVisibleAlways(Components.DESKTOP_MODE_APP),

                        AppWindowOnTopAtEnd(Components.DESKTOP_MODE_APP),

                        AppWindowHasDesktopModeInitialBoundsAtTheEnd(Components.DESKTOP_MODE_APP)

                    ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

        )



        @JvmStatic

        @FlickerConfigProvider

        fun flickerConfigProvider(): FlickerConfig =

            FlickerConfig()

                    .use(FlickerServiceConfig.DEFAULT)

                    .use(END_DRAG_TO_DESKTOP)

            FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(END_DRAG_TO_DESKTOP)

    }

}