Merge "Update wm flicker tests to account for seen filter" into tm-qpr-dev (9ec7a593) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,12 +18,15 @@ package com.android.server.wm.flicker.launch

	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import android.platform.test.annotations.RequiresDevice		import android.platform.test.annotations.RequiresDevice
			import android.platform.test.rule.SettingOverrideRule
			import android.provider.Settings
	import androidx.test.filters.FlakyTest		import androidx.test.filters.FlakyTest
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	import com.android.server.wm.flicker.FlickerTestParameterFactory		import com.android.server.wm.flicker.FlickerTestParameterFactory
	import com.android.server.wm.flicker.annotation.Group1		import com.android.server.wm.flicker.annotation.Group1
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
			import org.junit.ClassRule
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	@@ -98,5 +101,16 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter)
	return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance()		return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance()
	.getConfigNonRotationTests(repetitions = 3)		.getConfigNonRotationTests(repetitions = 3)
	}		}

			/**
			* Ensures that posted notifications will be visible on the lockscreen and not
			* suppressed due to being marked as seen.
			*/
			@ClassRule
			@JvmField
			val disableUnseenNotifFilterRule = SettingOverrideRule(
			Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS,
			/* value= */ "0",
			)
	}		}
	}		}

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt

+15 −1

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

	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import android.platform.test.annotations.RequiresDevice		import android.platform.test.annotations.RequiresDevice
			import android.platform.test.rule.SettingOverrideRule
			import android.provider.Settings
	import androidx.test.filters.FlakyTest		import androidx.test.filters.FlakyTest
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -25,6 +27,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
	import com.android.server.wm.flicker.annotation.Group1		import com.android.server.wm.flicker.annotation.Group1
	import com.android.server.wm.flicker.dsl.FlickerBuilder		import com.android.server.wm.flicker.dsl.FlickerBuilder
	import com.android.server.wm.traces.common.FlickerComponentName		import com.android.server.wm.traces.common.FlickerComponentName
			import org.junit.ClassRule
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	@@ -124,5 +127,16 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter)
	return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance()		return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance()
	.getConfigNonRotationTests(repetitions = 3)		.getConfigNonRotationTests(repetitions = 3)
	}		}

			/**
			* Ensures that posted notifications will be visible on the lockscreen and not
			* suppressed due to being marked as seen.
			*/
			@ClassRule
			@JvmField
			val disableUnseenNotifFilterRule = SettingOverrideRule(
			Settings.Secure.LOCK_SCREEN_SHOW_ONLY_UNSEEN_NOTIFICATIONS,
			/* value= */ "0",
			)
	}		}
	}		}