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

Commit 814c92b6 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Promote stable IME tests" into sc-dev am: 4a084c1d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50f221797550dbd9467d41765884b33f4e279036
parents 6411589c 4a084c1d

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

+2 −22
Original line number Diff line number Diff line
@@ -153,31 +153,11 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 


    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    fun navBarLayerIsAlwaysVisible_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerIsAlwaysVisible()

    }

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerIsAlwaysVisible()

    }



    @FlakyTest

    @Test

    fun statusBarLayerIsAlwaysVisible_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerIsAlwaysVisible()

    }

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

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

+13 −14
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
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 androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -85,55 +84,55 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleWindowsShownMoreThanOneConsecutiveEntry(listOf(IME_WINDOW_TITLE))



    @Postsubmit

    @Presubmit

    @Test

    fun imeAppWindowIsAlwaysVisible() = testSpec.imeAppWindowIsAlwaysVisible(testApp)



    @Postsubmit

    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

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



    @FlakyTest

    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)



    @FlakyTest

    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)



    @Postsubmit

    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Postsubmit

    @Presubmit

    @Test

    fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()



    @Postsubmit

    @Presubmit

    @Test

    fun imeAppLayerIsAlwaysVisible() = testSpec.imeAppLayerIsAlwaysVisible(testApp)

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

+14 −23
Original line number Diff line number Diff line
@@ -17,7 +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 androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -91,63 +91,54 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        testSpec.visibleWindowsShownMoreThanOneConsecutiveEntry(listOf(IME_WINDOW_TITLE))



    @Postsubmit

    @Presubmit

    @Test

    fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible()



    @Postsubmit

    @Presubmit

    @Test

    fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp)



    @Postsubmit

    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

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

        Surface.ROTATION_0)



    @Postsubmit

    @Presubmit

    @Test

    fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()



    @Postsubmit

    @Presubmit

    @Test

    fun imeAppLayerBecomesInvisible() = testSpec.imeAppLayerBecomesInvisible(testApp)



    @Postsubmit

    @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)

    fun navBarLayerRotatesAndScales() =

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

    }



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

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

+12 −12
Original line number Diff line number Diff line
@@ -17,7 +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 androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -89,43 +89,43 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun imeWindowBecomesVisible() = testSpec.imeWindowBecomesVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun appWindowAlwaysVisibleOnTop() = testSpec.appWindowAlwaysVisibleOnTop(testApp.`package`)



    @Postsubmit

    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

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



    @Postsubmit

    @Presubmit

    @Test

    fun imeLayerBecomesVisible() = testSpec.imeLayerBecomesVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun layerAlwaysVisible() = testSpec.layerAlwaysVisible(testApp.`package`)



    @Postsubmit

    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)
@@ -139,7 +139,7 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)