Merge "Disable "Notification Cooldown" for flicker tests" into main (c94813df) · Commits · e / os / android_frameworks_base

tests/FlickerTests/FlickerService/src/com/android/server/wm/flicker/service/Utils.kt

+2 −0

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

		import android.app.Instrumentation
		import android.platform.test.rule.DisableNotificationCooldownSettingRule
		import android.platform.test.rule.NavigationModeRule
		import android.platform.test.rule.PressHomeRule
		import android.platform.test.rule.UnlockScreenRule
		@@ -48,6 +49,7 @@ object Utils {
		clearCacheAfterParsing = false
		)
		)
		.around(DisableNotificationCooldownSettingRule())
		.around(PressHomeRule())
		}
		}

+7 −0

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

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.platform.test.rule.DisableNotificationCooldownSettingRule
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.FlickerTestData
		@@ -37,6 +38,7 @@ import com.android.server.wm.flicker.navBarWindowIsVisibleAtEnd
		import com.android.server.wm.flicker.taskBarLayerIsVisibleAtEnd
		import com.android.server.wm.flicker.taskBarWindowIsVisibleAtEnd
		import org.junit.Assume
		import org.junit.ClassRule
		import org.junit.FixMethodOrder
		import org.junit.Ignore
		import org.junit.Test
		@@ -208,5 +210,10 @@ open class OpenAppFromNotificationWarmTest(flicker: LegacyFlickerTest) :
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		fun getParams() = LegacyFlickerTestFactory.nonRotationTests()

		/** Ensures that posted notifications will alert and HUN even just after boot. */
		@ClassRule
		@JvmField
		val disablenotificationCooldown = DisableNotificationCooldownSettingRule()
		}
		}