Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[conflict] Merge "Update wm flicker tests to account for seen filter" into tm-qpr-dev am: 9ec7a5933c am: dc535ab32e" into udc-dev am: 73fc00bb8a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21562541

Change-Id: I3a56ee5833edcf65d94edbdb067052cf52c16890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-02-24 02:20:18 +00:00
committed by Automerger Merge Worker
parent 0dedfb7f48 73fc00bb8a
commit 09e3da4e5b
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,12 +19,15 @@ package com.android.server.wm.flicker.launch
import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.platform.test.rule.SettingOverrideRule
import android.provider.Settings
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerBuilder
import com.android.server.wm.flicker.FlickerTest
import com.android.server.wm.flicker.FlickerTestFactory
import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
import com.android.server.wm.traces.common.component.matchers.ComponentNameMatcher
import org.junit.ClassRule
import org.junit.FixMethodOrder
import org.junit.Ignore
import org.junit.Test
@@ -130,5 +133,16 @@ open class OpenAppFromLockNotificationCold(flicker: FlickerTest) :
fun getParams(): Collection<FlickerTest> {
return FlickerTestFactory.nonRotationTests()
}
/**
* 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",
)
}
}

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

@@ -18,6 +18,8 @@ package com.android.server.wm.flicker.launch
import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Presubmit
import android.platform.test.rule.SettingOverrideRule
import android.provider.Settings
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerBuilder
import com.android.server.wm.flicker.FlickerTest
@@ -25,6 +27,7 @@ import com.android.server.wm.flicker.FlickerTestFactory
import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory
import com.android.server.wm.flicker.statusBarLayerPositionAtEnd
import com.android.server.wm.traces.common.component.matchers.ComponentNameMatcher
import org.junit.ClassRule
import org.junit.FixMethodOrder
import org.junit.Ignore
import org.junit.Test
@@ -145,5 +148,16 @@ class OpenAppFromLockNotificationWarm(flicker: FlickerTest) : OpenAppFromNotific
fun getParams(): Collection<FlickerTest> {
return FlickerTestFactory.nonRotationTests()
}
/**
* 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",
)
}
}