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

Commit 0a0be03e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Promote stable close app tests to presubmit" into sc-dev am: 0fc7834f 

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

Change-Id: I02c3d7493c4e696d551ffd405ded3e2fbcf9e749
parents 5d102976 0fc7834f

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

+2 −20
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm.flicker.close 
import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -38,7 +37,6 @@ import com.android.server.wm.flicker.statusBarLayerRotatesScales 
import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer

import com.android.server.wm.flicker.wallpaperWindowBecomesVisible

import org.junit.Assume

import org.junit.Test



abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) {
@@ -92,32 +90,16 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
    @Presubmit

    @Test

    open fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

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

    }



    @FlakyTest

    @Test

    open fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

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

    }



    @Presubmit

    @Test

    open fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

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

    }



    @FlakyTest

    @Test

    open fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

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

    }



    @FlakyTest(bugId = 173689015)

    @Presubmit

    @Test

    open fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        testSpec.assertWm {
@@ -125,7 +107,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
        }

    }



    @FlakyTest(bugId = 173689015)

    @Presubmit

    @Test

    open fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        testSpec.assertLayers {