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

Commit 8715fd6d authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Generalize close app transition 

Share code and assertions between both transitions to improve maintainability

Test: atest FlickerTests:com.android.server.wm.flicker.close
Bug: 167521849
Change-Id: I73fa4341fc60d160764d80e0b627822a48f2a561
parent b7138470

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+4 −124
Original line number Diff line number Diff line
@@ -16,37 +16,12 @@ 


package com.android.server.wm.flicker.close



import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

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.dsl.FlickerBuilder

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.launcherReplacesAppWindowAsTopWindow

import com.android.server.wm.flicker.wallpaperWindowBecomesVisible

import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.visibleWindowsShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized
@@ -59,111 +34,16 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseAppBackButtonTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val testApp = SimpleAppHelper(instrumentation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

                test {

                    device.wakeUpAndGoToHomeScreen()

                }

                eachRun {

                    this.setRotation(testSpec.config.startRotation)

                    testApp.launchViaIntent(wmHelper)

                }

            }

class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransition(testSpec) {

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = {

            super.transition(this, it)

            transitions {

                device.pressBack()

                wmHelper.waitForHomeActivityVisible()

            }

            teardown {

                eachRun {

                    this.setRotation(Surface.ROTATION_0)

                }

                test {

                    testApp.exit()

                }

            }

        }

    }



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun launcherReplacesAppWindowAsTopWindow() =

        testSpec.launcherReplacesAppWindowAsTopWindow(testApp)



    @Presubmit

    @Test

    fun wallpaperWindowBecomesVisible() = testSpec.wallpaperWindowBecomesVisible()



    @Presubmit

    @Test

    fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation,

        Surface.ROTATION_0)



    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun wallpaperLayerReplacesAppLayer() = testSpec.wallpaperLayerReplacesAppLayer(testApp)



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

        }



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Test

    fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest(bugId = 173684672)

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 173684672)

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

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

        @JvmStatic

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+4 −124
Original line number Diff line number Diff line
@@ -16,37 +16,12 @@ 


package com.android.server.wm.flicker.close



import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

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.dsl.FlickerBuilder

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.launcherReplacesAppWindowAsTopWindow

import com.android.server.wm.flicker.wallpaperWindowBecomesVisible

import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.visibleWindowsShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized
@@ -59,111 +34,16 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseAppHomeButtonTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val testApp = SimpleAppHelper(instrumentation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

                test {

                    device.wakeUpAndGoToHomeScreen()

                }

                eachRun {

                    testApp.launchViaIntent(wmHelper)

                    this.setRotation(testSpec.config.startRotation)

                }

            }

class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransition(testSpec) {

    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = {

            super.transition(this, it)

            transitions {

                device.pressHome()

                wmHelper.waitForHomeActivityVisible()

            }

            teardown {

                eachRun {

                    this.setRotation(Surface.ROTATION_0)

                }

                test {

                    testApp.exit()

                }

            }

        }

    }



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun launcherReplacesAppWindowAsTopWindow() =

        testSpec.launcherReplacesAppWindowAsTopWindow(testApp)



    @Presubmit

    @Test

    fun wallpaperWindowBecomesVisible() = testSpec.wallpaperWindowBecomesVisible()



    @Presubmit

    @Test

    fun noUncoveredRegions() = testSpec.noUncoveredRegions(

        testSpec.config.startRotation, Surface.ROTATION_0)



    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun wallpaperLayerReplacesAppLayer() = testSpec.wallpaperLayerReplacesAppLayer(testApp)



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

        }



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Test

    fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest(bugId = 173689015)

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 173689015)

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleLayersShownMoreThanOneConsecutiveEntry()



    companion object {

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

        @JvmStatic

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt

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

 * Copyright (C) 2021 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.server.wm.flicker.close



import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

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

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

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.server.wm.flicker.helpers.StandardAppHelper

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.launcherReplacesAppWindowAsTopWindow

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.visibleWindowsShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer

import com.android.server.wm.flicker.wallpaperWindowBecomesVisible

import org.junit.Assume

import org.junit.Test



abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) {

    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    protected open val testApp: StandardAppHelper = SimpleAppHelper(instrumentation)

    protected open val transition: FlickerBuilder.(Map<String, Any?>) -> Unit = {

        setup {

            eachRun {

                testApp.launchViaIntent(wmHelper)

                this.setRotation(testSpec.config.startRotation)

            }

        }

        teardown {

            test {

                testApp.exit()

            }

        }

    }



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

            transition(testSpec.config)

        }

    }



    @Presubmit

    @Test

    open fun navBarWindowIsAlwaysVisible() {

        testSpec.navBarWindowIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun statusBarWindowIsAlwaysVisible() {

        testSpec.statusBarWindowIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun navBarLayerIsAlwaysVisible() {

        testSpec.navBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() {

        testSpec.statusBarLayerIsAlwaysVisible()

    }



    @Presubmit

    @Test

    open fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Test

    open fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @Presubmit

    @Test

    open fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Test

    open fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest(bugId = 173689015)

    @Test

    open fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.visibleWindowsShownMoreThanOneConsecutiveEntry()

    }



    @FlakyTest(bugId = 173689015)

    @Test

    open fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.visibleLayersShownMoreThanOneConsecutiveEntry()

    }



    @Presubmit

    @Test

    open fun noUncoveredRegions() {

        testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @Presubmit

    @Test

    open fun launcherReplacesAppWindowAsTopWindow() {

        testSpec.launcherReplacesAppWindowAsTopWindow(testApp)

    }



    @Presubmit

    @Test

    open fun wallpaperWindowBecomesVisible() {

        testSpec.wallpaperWindowBecomesVisible()

    }



    @Presubmit

    @Test

    open fun wallpaperLayerReplacesAppLayer() {

        testSpec.wallpaperLayerReplacesAppLayer(testApp)

    }

}
 
 No newline at end of file