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

Commit 389f1d9a authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Add support for Tablets on IME tests 

Moreover, refactor the test to reuse the base test class with general assertions and fix ktlint errors

Bug: 234735502
Test: atest FlickerTests
Change-Id: I72f8c6bdb3253237f9a7dc37e6e07f7b33104698
parent a58f157d

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt

+22 −70
Original line number Diff line number Diff line
@@ -16,27 +16,18 @@ 


package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.BaseTest

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.Group2

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

import com.android.server.wm.flicker.entireScreenCovered

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

import com.android.server.wm.flicker.navBarLayerIsVisible

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

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.statusBarLayerIsVisible

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

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.traces.common.ComponentMatcher

import org.junit.FixMethodOrder

import org.junit.Test
@@ -61,13 +52,11 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group2

class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

class CloseImeAutoOpenWindowToAppTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) {

    private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit = {

        setup {

            eachRun {

                testApp.launchViaIntent(wmHelper)
@@ -82,23 +71,12 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
            testApp.closeIME(wmHelper)

        }

    }

    }



    @Presubmit

    @Test

    fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()



    @Presubmit

    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()



    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry()

        }

    }

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    @Presubmit

    @Test
@@ -108,18 +86,6 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsVisible() = testSpec.statusBarLayerIsVisible()



    @Presubmit

    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Presubmit

    @Test

    fun imeLayerVisibleStart() {
@@ -148,33 +114,19 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry()

        }

    }



    companion object {

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

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance()

                .getConfigNonRotationTests(repetitions = 3,

                .getConfigNonRotationTests(

                    repetitions = 3,

                    // b/190352379 (IME doesn't show on app launch in 90 degrees)

                    supportedRotations = listOf(Surface.ROTATION_0),

                    supportedNavigationModes = listOf(

                        WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY)

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                    )

                )

        }

    }

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt

+22 −74
Original line number Diff line number Diff line
@@ -16,27 +16,18 @@ 


package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.BaseTest

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.Group2

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

import com.android.server.wm.flicker.entireScreenCovered

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

import com.android.server.wm.flicker.navBarLayerIsVisible

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

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.statusBarLayerIsVisible

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

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.traces.common.ComponentMatcher

import org.junit.FixMethodOrder

import org.junit.Test
@@ -61,13 +52,11 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group2

class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

class CloseImeAutoOpenWindowToHomeTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) {

    private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.startRotation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit = {

        setup {

            eachRun {

                testApp.launchViaIntent(wmHelper)
@@ -86,23 +75,12 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
                .waitForAndVerify()

        }

    }

    }



    @Presubmit

    @Test

    fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()



    @Presubmit

    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()



    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry()

        }

    }

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    @Presubmit

    @Test
@@ -114,10 +92,6 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
        }

    }



    @Presubmit

    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Presubmit

    @Test

    fun imeLayerVisibleStart() {
@@ -148,32 +122,6 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsVisible() = testSpec.statusBarLayerIsVisible()



    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(listOf(

                ComponentMatcher.IME,

                ComponentMatcher.SPLASH_SCREEN))

        }

    }



    companion object {

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

        @JvmStatic

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt

+94 −46
Original line number Diff line number Diff line
@@ -16,21 +16,17 @@ 


package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.BaseTest

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.Group4

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

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

import com.android.server.wm.flicker.navBarWindowIsVisible

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.flicker.traces.region.RegionSubject

import com.android.server.wm.traces.common.ComponentMatcher

import org.junit.FixMethodOrder
@@ -44,13 +40,11 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group4

class CloseImeEditorPopupDialogTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

class CloseImeEditorPopupDialogTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) {

    private val imeTestApp = ImeEditorPopupDialogAppHelper(instrumentation, testSpec.startRotation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit = {

        setup {

            eachRun {

                imeTestApp.launchViaIntent(wmHelper)
@@ -73,15 +67,67 @@ class CloseImeEditorPopupDialogTest(private val testSpec: FlickerTestParameter) 
            }

        }

    }

    }



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    /** {@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 statusBarLayerIsVisibleAtStartAndEnd() =

        super.statusBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun taskBarLayerIsVisibleAtStartAndEnd() =

        super.taskBarLayerIsVisibleAtStartAndEnd()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @Postsubmit

    @Test
@@ -105,13 +151,15 @@ class CloseImeEditorPopupDialogTest(private val testSpec: FlickerTestParameter) 
    fun imeSnapshotAssociatedOnAppVisibleRegion() {

        testSpec.assertLayers {

            this.invoke("imeSnapshotAssociatedOnAppVisibleRegion") {

                val imeSnapshotLayers = it.subjects.filter {

                    subject -> subject.name.contains(

                    ComponentMatcher.IME_SNAPSHOT.toLayerName()) && subject.isVisible

                val imeSnapshotLayers = it.subjects.filter { subject ->

                    subject.name.contains(

                        ComponentMatcher.IME_SNAPSHOT.toLayerName()

                    ) && subject.isVisible

                }

                if (imeSnapshotLayers.isNotEmpty()) {

                    val visibleAreas = imeSnapshotLayers.mapNotNull { imeSnapshotLayer ->

                        imeSnapshotLayer.layer?.visibleRegion }.toTypedArray()

                        imeSnapshotLayer.layer?.visibleRegion

                    }.toTypedArray()

                    val imeVisibleRegion = RegionSubject.assertThat(visibleAreas, this, timestamp)

                    val appVisibleRegion = it.visibleRegion(imeTestApp)

                    if (imeVisibleRegion.region.isNotEmpty) {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt

+40 −73
Original line number Diff line number Diff line
@@ -16,27 +16,19 @@ 


package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.BaseTest

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.Group2

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

import com.android.server.wm.flicker.entireScreenCovered

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

import com.android.server.wm.flicker.navBarLayerIsVisible

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

import com.android.server.wm.flicker.navBarWindowIsVisible

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

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.flicker.navBarLayerPositionAtStartAndEnd

import com.android.server.wm.traces.common.ComponentMatcher

import org.junit.Assume.assumeFalse

import org.junit.Assume.assumeTrue

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -52,13 +44,11 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group2

class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

class CloseImeWindowToAppTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) {

    private val testApp = ImeAppHelper(instrumentation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit = {

        setup {

            test {

                testApp.launchViaIntent(wmHelper)
@@ -76,19 +66,11 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
            testApp.closeIME(wmHelper)

        }

    }

    }



    @Presubmit

    @Test

    fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry(listOf(

                ComponentMatcher.IME,
@@ -97,51 +79,28 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test

    fun imeAppWindowIsAlwaysVisible() {

        testSpec.assertWm {

            this.isAppWindowOnTop(testApp)

        }

    }



    @Presubmit

    @Test

    fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsVisible() = testSpec.navBarLayerIsVisible()



    @Presubmit

    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        assumeFalse(testSpec.isLandscapeOrSeascapeAtStart)

        testSpec.navBarLayerRotatesAndScales()

    override fun navBarLayerPositionAtStartAndEnd() {

        Assume.assumeFalse(testSpec.isTablet)

        Assume.assumeFalse(testSpec.isLandscapeOrSeascapeAtStart)

        testSpec.navBarLayerPositionAtStartAndEnd()

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        assumeTrue(testSpec.isLandscapeOrSeascapeAtStart)

        testSpec.navBarLayerRotatesAndScales()

    fun navBarLayerPositionAtStartAndEndLandscapeOrSeascapeAtStart() {

        Assume.assumeFalse(testSpec.isTablet)

        Assume.assumeTrue(testSpec.isLandscapeOrSeascapeAtStart)

        testSpec.navBarLayerPositionAtStartAndEnd()

    }



    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry()

        }

    }

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    @Presubmit

    @Test
@@ -155,6 +114,14 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Presubmit

    @Test

    fun imeAppWindowIsAlwaysVisible() {

        testSpec.assertWm {

            this.isAppWindowOnTop(testApp)

        }

    }



    companion object {

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

        @JvmStatic

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt

+52 −77
Original line number Diff line number Diff line
@@ -16,26 +16,18 @@ 


package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.BaseTest

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.Group2

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

import com.android.server.wm.flicker.entireScreenCovered

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

import com.android.server.wm.flicker.navBarLayerIsVisible

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

import com.android.server.wm.flicker.navBarWindowIsVisible

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

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.traces.common.ComponentMatcher

import org.junit.FixMethodOrder

import org.junit.Test
@@ -52,13 +44,11 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group2

class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

class CloseImeWindowToHomeTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) {

    private val testApp = ImeAppHelper(instrumentation)



    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit = {

        setup {

            eachRun {

                testApp.launchViaIntent(wmHelper)
@@ -78,27 +68,46 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
            }

        }

    }

    }



    /** {@inheritDoc} */

    @Presubmit

    @Test

    fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible()

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry(

                listOf(

                    ComponentMatcher.IME,

                    ComponentMatcher.SPLASH_SCREEN,

                    ComponentMatcher.SNAPSHOT

                )

            )

        }

    }



    @Presubmit

    /** {@inheritDoc} */

    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible()

    override fun statusBarLayerPositionAtStartAndEnd() =

        super.statusBarLayerPositionAtStartAndEnd()



    /** {@inheritDoc} */

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry(listOf(

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                listOf(

                    ComponentMatcher.IME,

                ComponentMatcher.SPLASH_SCREEN,

                ComponentMatcher.SNAPSHOT))

                    ComponentMatcher.SPLASH_SCREEN

                )

            )

        }

    }



    @Presubmit

    @Test

    fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()



    @Presubmit

    @Test

    fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible()
@@ -113,22 +122,6 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerIsVisible() = testSpec.navBarLayerIsVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsVisible() = testSpec.navBarLayerIsVisible()



    @Presubmit

    @Test

    fun entireScreenCovered() = testSpec.entireScreenCovered()



    @Presubmit

    @Test

    fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()



    @Presubmit

    @Test

    fun imeAppLayerBecomesInvisible() {
@@ -139,24 +132,6 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 206753786)

    @Test

    fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(listOf(

                ComponentMatcher.IME,

                ComponentMatcher.SPLASH_SCREEN))

        }

    }



    companion object {

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

        @JvmStatic