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

Commit 62c8628d authored by Mateusz Cicheński's avatar Mateusz Cicheński
Browse files

Remove the FlakyTest annotation from no-longer flaky test. 

Effectively removing override, given that it always simply calls super method.

Test: atest WMShellFlickerTests
Bug: 206753786

Change-Id: I5b266b9aa46d3d5464dc8ad3b602b08df4a56799
parent 0ec6e127

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt

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


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
@@ -77,11 +76,6 @@ open class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec 
            }

        }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /**

     * Checks [pipApp] window remains visible throughout the animation

     */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt

+1 −10
Original line number Diff line number Diff line
@@ -28,13 +28,12 @@ import com.android.server.wm.flicker.dsl.FlickerBuilder 
import com.android.server.wm.flicker.entireScreenCovered

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.traces.common.FlickerComponentName

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_PORTRAIT

import com.android.wm.shell.flicker.testapp.Components.PipActivity.ACTION_ENTER_PIP

import com.android.wm.shell.flicker.testapp.Components.FixedActivity.EXTRA_FIXED_ORIENTATION

import com.android.wm.shell.flicker.testapp.Components.PipActivity.ACTION_ENTER_PIP

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -113,14 +112,6 @@ class EnterPipToOtherOrientationTest( 
    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    /**

     * Checks that the [FlickerComponentName.STATUS_BAR] has the correct position at

     * the start and end of the transition

     */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that all parts of the screen are covered at the start and end of the transition

     *

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -78,11 +78,6 @@ class ExitPipViaExpandButtonClickTest( 
            }

        }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTest.kt

+1 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group3

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -78,10 +77,6 @@ class ExitPipWithSwipeDownTest(testSpec: FlickerTestParameter) : ExitPipTransiti 
    @Test

    override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible()



    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that the focus doesn't change between windows during the transition

     */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt

+0 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.server.wm.flicker.entireScreenCovered 
import com.android.server.wm.flicker.helpers.WindowUtils

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

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import org.junit.FixMethodOrder

import org.junit.Test
@@ -95,13 +94,6 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS 
    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    /**

     * Checks the position of the status bar at the start and end of the transition

     */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that [fixedApp] layer is within [screenBoundsStart] at the start of the transition

     */