Merge "Revert "Enable FASS assertions for IME Appear"" (89b04a91) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt

+0 −24

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

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		@@ -35,12 +34,10 @@ import com.android.server.wm.flicker.navBarLayerRotatesAndScales
		import com.android.server.wm.flicker.navBarWindowIsVisible
		import com.android.server.wm.flicker.entireScreenCovered
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.rules.WMFlickerServiceRuleForTestSpec
		import com.android.server.wm.flicker.statusBarLayerIsVisible
		import com.android.server.wm.flicker.statusBarLayerRotatesScales
		import com.android.server.wm.flicker.statusBarWindowIsVisible
		import org.junit.FixMethodOrder
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		@@ -56,9 +53,6 @@ import org.junit.runners.Parameterized
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group2
		class OpenImeWindowTest(private val testSpec: FlickerTestParameter) {
		@get:Rule
		val flickerRule = WMFlickerServiceRuleForTestSpec(testSpec)

		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		private val testApp = ImeAppHelper(instrumentation)

		@@ -152,24 +146,6 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) {
		}
		}

		@Postsubmit
		@Test
		fun runPresubmitAssertion() {
		flickerRule.checkPresubmitAssertions()
		}

		@Postsubmit
		@Test
		fun runPostsubmitAssertion() {
		flickerRule.checkPostsubmitAssertions()
		}

		@FlakyTest
		@Test
		fun runFlakyAssertion() {
		flickerRule.checkFlakyAssertions()
		}

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