Merge "Remove the FlakyTest annotation from no-longer flaky test." (4e188f31) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.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 android.platform.test.annotations.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		@@ -64,11 +63,6 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran
		}
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 206753786)
		@Test
		override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

		/**
		* Checks that the focus changes between the pip menu window and the launcher when clicking the
		* dismiss button on pip menu to close the pip window.

+0 −4

Original line number	Diff line number	Diff line
		@@ -168,10 +168,6 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		}
		}

		@FlakyTest(bugId = 206753786)
		@Test
		override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

		companion object {
		/**
		* Creates the test configurations.

+0 −7

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

		import android.view.Surface
		import android.platform.test.annotations.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		@@ -26,7 +25,6 @@ import com.android.server.wm.flicker.annotation.Group3
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.traces.region.RegionSubject
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized
		@@ -80,11 +78,6 @@ open class MovePipDownShelfHeightChangeTest(
		current.isHigherOrEqual(previous.region)
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 206753786)
		@Test
		override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

		companion object {
		/**
		* Creates the test configurations.