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

Commit 9cff7a99 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Promote stable ime tests to presubmit" into sc-dev am: 24923769 

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

Change-Id: Ifa2270cde6401505fe7bacbc34d8bc1b34602392
parents 231c0c74 24923769

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

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

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -37,7 +35,6 @@ 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.traces.parser.windowmanager.WindowManagerStateHelper

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -76,15 +73,15 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {
@@ -94,59 +91,43 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
        }

    }



    @Postsubmit

    @Presubmit

    @Test

    fun imeAppWindowIsAlwaysVisible() = testSpec.imeAppWindowIsAlwaysVisible(testApp)



    @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 imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()



    @Postsubmit

    @Presubmit

    @Test

    fun imeAppLayerIsAlwaysVisible() = testSpec.imeAppLayerIsAlwaysVisible(testApp)



    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Test

    fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

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

+0 −29
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm.flicker.ime 
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
@@ -37,7 +36,6 @@ 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.traces.parser.windowmanager.WindowManagerStateHelper

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -120,28 +118,12 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @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)

    }
@@ -156,17 +138,6 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                listOf(IME_WINDOW_TITLE, WindowManagerStateHelper.SPLASH_SCREEN_NAME))

        }

    }



    @FlakyTest

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                listOf(IME_WINDOW_TITLE, WindowManagerStateHelper.SPLASH_SCREEN_NAME))

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

+1 −11
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.Instrumentation 
import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -37,7 +36,6 @@ import com.android.server.wm.flicker.startRotation 
import com.android.server.wm.flicker.statusBarLayerRotatesScales

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

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -136,18 +134,10 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
    @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

    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {

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

+2 −20
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.Instrumentation 
import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -39,7 +38,6 @@ 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 org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -119,32 +117,16 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Test

    fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {
@@ -152,7 +134,7 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @FlakyTest

    @Presubmit

    @Test

    fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {

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

+1 −19
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.Instrumentation 
import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -43,7 +42,6 @@ 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.testapp.ActivityOptions

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -145,32 +143,16 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
    @Presubmit

    @Test

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

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

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

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

    }



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

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

    }



    @FlakyTest

    @Test

    fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

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

    }



    @FlakyTest

    @Presubmit

    @Test

    fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {