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

Commit 3dbb4873 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use only @FlakyTest annotations on FlickerTests"

parents ebafe9a3 f4cf0fb9

tests/FlickerTests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ android_test { 
        "flickerlib",

        "truth-prebuilt",

        "app-helpers-core",

        "launcher-helper-lib",

        "launcher-aosp-tapl"

    ],

}

tests/FlickerTests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.server.wm.flicker"/>

        <option name="exclude-annotation" value="org.junit.Ignore" />

        <option name="exclude-annotation" value="androidx.test.filters.FlakyTest" />

        <option name="shell-timeout" value="6600s" />

        <option name="test-timeout" value="6000s" />

        <option name="hidden-api-checks" value="false" />

tests/FlickerTests/src/com/android/server/wm/flicker/DebugTest.kt

+4 −2
Original line number Diff line number Diff line
@@ -20,22 +20,24 @@ import android.platform.helpers.IAppHelper 
import android.util.Rational

import android.view.Surface

import androidx.test.InstrumentationRegistry

import androidx.test.filters.FlakyTest

import androidx.test.filters.LargeTest

import androidx.test.runner.AndroidJUnit4

import androidx.test.uiautomator.UiDevice

import com.android.server.wm.flicker.helpers.ImeAppHelper

import com.android.server.wm.flicker.helpers.PipAppHelper

import org.junit.FixMethodOrder

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters



/**

 * Tests to help debug individual transitions, capture video recordings and create test cases.

 *

 * Not actual tests

 */

@LargeTest

@Ignore("Used for debugging transitions used in FlickerTests.")

@FlakyTest

@RunWith(AndroidJUnit4::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class DebugTest {

tests/FlickerTests/src/com/android/server/wm/flicker/NonRotationTestBase.kt

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm.flicker 


import android.view.Surface

import androidx.test.filters.FlakyTest

import org.junit.Ignore

import org.junit.Test

import org.junit.runners.Parameterized
@@ -27,7 +26,6 @@ abstract class NonRotationTestBase( 
    protected val beginRotation: Int

) : FlickerTestBase() {

    @FlakyTest(bugId = 141361128)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkCoveredRegion_noUncoveredRegions() {

        val displayBounds = WindowUtils.getDisplayBounds(beginRotation)
@@ -38,7 +36,6 @@ abstract class NonRotationTestBase( 
    }



    @FlakyTest(bugId = 141361128)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkVisibility_navBarLayerIsAlwaysVisible() {

        checkResults {
@@ -48,7 +45,6 @@ abstract class NonRotationTestBase( 
    }



    @FlakyTest(bugId = 141361128)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkVisibility_statusBarLayerIsAlwaysVisible() {

        checkResults {

tests/FlickerTests/src/com/android/server/wm/flicker/RotationTestBase.kt

+0 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm.flicker 


import android.view.Surface

import androidx.test.filters.FlakyTest

import org.junit.Ignore

import org.junit.Test

import org.junit.runners.Parameterized
@@ -29,7 +28,6 @@ abstract class RotationTestBase( 
    protected val endRotation: Int

) : FlickerTestBase() {

    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkVisibility_navBarWindowIsAlwaysVisible() {

        checkResults {
@@ -39,7 +37,6 @@ abstract class RotationTestBase( 
    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkVisibility_statusBarWindowIsAlwaysVisible() {

        checkResults {
@@ -86,7 +83,6 @@ abstract class RotationTestBase( 
    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkVisibility_navBarLayerIsAlwaysVisible() {

        checkResults {
@@ -96,7 +92,6 @@ abstract class RotationTestBase( 
    }



    @FlakyTest(bugId = 140855415)

    @Ignore("Waiting bug feedback")

    @Test

    fun checkVisibility_statusBarLayerIsAlwaysVisible() {

        checkResults {