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

Merge "Update notification assertions to ignore image wallpaper" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-07-21 13:38:19 +00:00
committed by Android (Google) Code Review
parent b84c696ca5 cd7ce5d7b8
commit 5265aaf8d4
3 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/FlickerTests/src/com/android/server/wm/flicker/notification/Consts.kt Normal file
View File

@@ -0,0 +1,23 @@
/*
* 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")
}

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

@@ -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.

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

@@ -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.