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

Commit dffe41cc authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Update wm flicker tests to account for seen filter"

parents a0c020fa 68db8da1

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",

        )

    }

}