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

Commit 7c0bb8ae authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Promote or demote stable and flaky flicker tests"

parents 6b57bc99 64d5b839

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

+3 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -84,11 +85,9 @@ class AppPairsTestCannotPairNonResizeableApps( 
    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @FlakyTest

    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() {

        super.navBarLayerIsVisible()

    }

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

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


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -58,6 +59,10 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
            }

        }



    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt

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


package com.android.wm.shell.flicker.apppairs



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -76,6 +77,10 @@ class AppPairsTestSupportPairNonResizeableApps( 
        resetMultiWindowConfig(instrumentation)

    }



    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt

+3 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.flicker.apppairs



import android.os.SystemClock

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -108,11 +109,9 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
        }

    }



    @FlakyTest

    @Postsubmit

    @Test

    override fun navBarLayerIsVisible() {

        super.navBarLayerIsVisible()

    }

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    companion object {

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

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

+9 −7
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package com.android.wm.shell.flicker.apppairs



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 com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter
@@ -61,11 +61,13 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
            }

        }



    @FlakyTest

    @Postsubmit

    @Test

    override fun statusBarLayerIsVisible() {

        super.statusBarLayerIsVisible()

    }

    override fun navBarLayerIsVisible() = super.navBarLayerIsVisible()



    @Postsubmit

    @Test

    override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible()



    @Presubmit

    @Test
@@ -80,13 +82,13 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
    @Test

    fun appPairsDividerIsVisible() = testSpec.appPairsDividerIsVisible()



    @FlakyTest(bugId = 172776659)

    @Postsubmit

    @Test

    fun appPairsPrimaryBoundsIsVisible() =

        testSpec.appPairsPrimaryBoundsIsVisible(testSpec.config.endRotation,

            primaryApp.defaultWindowName)



    @FlakyTest(bugId = 172776659)

    @Postsubmit

    @Test

    fun appPairsSecondaryBoundsIsVisible() =

        testSpec.appPairsSecondaryBoundsIsVisible(testSpec.config.endRotation,