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

Commit 6d9e90b6 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Promote stable flicker tests (app close)" into sc-dev am: 488a0a3b 

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

Change-Id: Ic1c96651da589536fdd24a2e67f3fada7752dd81
parents 03d1edf7 488a0a3b

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

+0 −26
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


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



import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter
@@ -24,7 +23,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.annotation.Group1

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
@@ -48,30 +46,6 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio 
            }

        }



    @FlakyTest(bugId = 185401242)

    @Test

    override fun launcherLayerReplacesApp() {

        super.launcherLayerReplacesApp()

    }



    @FlakyTest(bugId = 185401242)

    @Test

    override fun launcherReplacesAppWindowAsTopWindow() {

        super.launcherReplacesAppWindowAsTopWindow()

    }



    @FlakyTest(bugId = 185401242)

    @Test

    override fun launcherWindowBecomesVisible() {

        super.launcherWindowBecomesVisible()

    }



    @FlakyTest(bugId = 185401242)

    @Test

    override fun noUncoveredRegions() {

        super.noUncoveredRegions()

    }



    companion object {

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

        @JvmStatic

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

+0 −26
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


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
@@ -24,7 +23,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.annotation.Group1

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
@@ -48,30 +46,6 @@ 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

+6 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
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
@@ -83,7 +82,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
        testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)

    }



    @Postsubmit

    @Presubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() {

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

    }



    @Postsubmit

    @Presubmit

    @Test

    open fun statusBarLayerRotatesScales() {

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
@@ -117,25 +116,25 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
        }

    }



    @FlakyTest(bugId = 185400889)

    @Presubmit

    @Test

    open fun noUncoveredRegions() {

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

    }



    @FlakyTest(bugId = 185400889)

    @Presubmit

    @Test

    open fun launcherReplacesAppWindowAsTopWindow() {

        testSpec.launcherReplacesAppWindowAsTopWindow(testApp)

    }



    @Postsubmit

    @Presubmit

    @Test

    open fun launcherWindowBecomesVisible() {

        testSpec.launcherWindowBecomesVisible()

    }



    @FlakyTest(bugId = 185400889)

    @Presubmit

    @Test

    open fun launcherLayerReplacesApp() {

        testSpec.launcherLayerReplacesApp(testApp)