Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f3dce6 authored by Steve Elliott's avatar Steve Elliott Committed by Cole Faust
Browse files

[conflict] Merge "Update wm flicker tests to account for seen filter" into... 

[conflict] Merge "Update wm flicker tests to account for seen filter" into tm-qpr-dev am: 9ec7a593 am: dc535ab3

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



Change-Id: I81072df39da8540f31183f4264ac26a28f0e4352
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2a7bf8b dc535ab3

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

+14 −0
Original line number Diff line number Diff line
@@ -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",

        )

    }

}

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

+14 −0
Original line number Diff line number Diff line
@@ -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",

        )

    }

}