From a282e4295af2a411c671d3865e94232e4f7736bb Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Tue, 21 Feb 2023 18:35:40 +0000 Subject: [PATCH] Update wm flicker tests to account for seen filter Fixes: 270035407 Test: atest FlickerTests Change-Id: I9b21b87e82994dd438cf7b887d84a93b2c66bac7 Merged-In: I9b21b87e82994dd438cf7b887d84a93b2c66bac7 --- .../launch/OpenAppFromLockNotificationCold.kt | 16 +++++++++++++++- .../launch/OpenAppFromLockNotificationWarm.kt | 16 +++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt index a8cbc5dc922c8..e05312fe8cc58 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt @@ -18,12 +18,15 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.RequiresDevice +import android.platform.test.rule.SettingOverrideRule +import android.provider.Settings import androidx.test.filters.FlakyTest import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.dsl.FlickerBuilder +import org.junit.ClassRule import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -98,5 +101,16 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance() .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", + ) } -} \ No newline at end of file +} diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt index cd8dea012db51..fcec79f4d7f53 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt @@ -18,6 +18,8 @@ package com.android.server.wm.flicker.launch import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.RequiresDevice +import android.platform.test.rule.SettingOverrideRule +import android.provider.Settings import androidx.test.filters.FlakyTest import com.android.server.wm.flicker.FlickerParametersRunnerFactory 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.dsl.FlickerBuilder import com.android.server.wm.traces.common.FlickerComponentName +import org.junit.ClassRule import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith @@ -124,5 +127,16 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) return com.android.server.wm.flicker.FlickerTestParameterFactory.getInstance() .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", + ) } -} \ No newline at end of file +}