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

Commit cd7ce5d7 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Update notification assertions to ignore image wallpaper 

This window seems to be flickering in the WM trace, but it doesn't affect the SF trace and is not visible to the user.

Bug: 288341660
Test: atest FlickerTestsANotification
Change-Id: I1d4c9e3c33cc7ed6cf1b6f8981b405988fb35a01
parent 49e61e47

tests/FlickerTests/src/com/android/server/wm/flicker/notification/Consts.kt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.notification



import android.tools.common.traces.component.ComponentNameMatcher



object Consts {

    val IMAGE_WALLPAPER = ComponentNameMatcher("", "com.android.systemui.wallpapers.ImageWallpaper")

}
 
 No newline at end of file

tests/FlickerTests/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationColdTest.kt

+17 −0
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.server.wm.flicker.notification



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.rule.SettingOverrideRule

import android.provider.Settings

import android.tools.common.traces.component.ComponentNameMatcher

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.LegacyFlickerTest
@@ -107,6 +109,21 @@ open class OpenAppFromLockscreenNotificationColdTest(flicker: LegacyFlickerTest) 
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        flicker.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry(

                listOf(

                    ComponentNameMatcher.SPLASH_SCREEN,

                    ComponentNameMatcher.SNAPSHOT,

                    ComponentNameMatcher.SECONDARY_HOME_HANDLE,

                    Consts.IMAGE_WALLPAPER

                )

            )

        }

    }



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/notification/OpenAppFromLockscreenNotificationWarmTest.kt

+15 −0
Original line number Diff line number Diff line
@@ -139,6 +139,21 @@ class OpenAppFromLockscreenNotificationWarmTest(flicker: LegacyFlickerTest) : 
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    @Presubmit

    @Test

    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {

        flicker.assertWm {

            this.visibleWindowsShownMoreThanOneConsecutiveEntry(

                listOf(

                    ComponentNameMatcher.SPLASH_SCREEN,

                    ComponentNameMatcher.SNAPSHOT,

                    ComponentNameMatcher.SECONDARY_HOME_HANDLE,

                    Consts.IMAGE_WALLPAPER

                )

            )

        }

    }



    companion object {

        /**

         * Creates the test configurations.