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

Commit 7b32722e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Promote stable flicker tests" into sc-dev am: ec6c6835 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14468529

Change-Id: Idc50575c9fbc037053b2fcfd404ba180a3f655e3
parents 32db70f7 ec6c6835

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

+26 −0
Original line number Diff line number Diff line
@@ -16,12 +16,14 @@ 


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



import android.platform.test.annotations.Postsubmit

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

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized
@@ -44,6 +46,30 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
            }

        }



    @Postsubmit

    @Test

    override fun statusBarLayerIsAlwaysVisible() {

        super.statusBarLayerIsAlwaysVisible()

    }



    @Postsubmit

    @Test

    override fun statusBarLayerRotatesScales() {

        super.statusBarLayerRotatesScales()

    }



    @Postsubmit

    @Test

    override fun launcherLayerReplacesApp() {

        super.launcherLayerReplacesApp()

    }



    @Postsubmit

    @Test

    override fun noUncoveredRegions() {

        super.noUncoveredRegions()

    }



    companion object {

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

        @JvmStatic

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

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm.flicker.close



import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest
@@ -82,7 +83,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
        testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)

    }



    @FlakyTest

    @Postsubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() {

        testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
@@ -94,7 +95,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Postsubmit

    @Test

    open fun statusBarLayerRotatesScales() {

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
@@ -122,13 +123,13 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
        testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @Presubmit

    @FlakyTest(bugId = 185400889)

    @Test

    open fun launcherReplacesAppWindowAsTopWindow() {

        testSpec.launcherReplacesAppWindowAsTopWindow(testApp)

    }



    @Presubmit

    @Postsubmit

    @Test

    open fun launcherWindowBecomesVisible() {

        testSpec.launcherWindowBecomesVisible()

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

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FlakyTest(bugId = 185400889)

class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter) {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

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

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

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants
@@ -104,7 +105,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @Test

    fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp)



    @FlakyTest

    @Postsubmit

    @Test

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

        Surface.ROTATION_0)
@@ -113,7 +114,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @Test

    fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()



    @FlakyTest

    @Postsubmit

    @Test

    fun imeAppLayerBecomesInvisible() = testSpec.imeAppLayerBecomesInvisible(testApp)
@@ -123,7 +124,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    }



    @FlakyTest

    @Postsubmit

    @Test

    fun statusBarLayerRotatesScales() {

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
@@ -137,7 +138,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @FlakyTest

    @Postsubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm.flicker.ime



import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants
@@ -98,7 +99,7 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @FlakyTest

    @Postsubmit

    @Test

    fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible()