commit 79209bea7730afc9f217e3084b526799841eace2
author Pablo Gamito <pablogamito@google.com> Wed Jul 19 12:43:10 2023 +0000
committer Pablo Gamito <pablogamito@google.com> Wed Jul 19 12:45:03 2023 +0000
tree fd60cb83f936d99340478f03e36efb04f1307843
parent 3c7204fc91dd8ca69563099b85e4007bd0153544

Make ENTIRE_TRACE::VisibleLayersShownMoreThanOneConsecutiveEntry non-blocking

Test: atest com.android.server.wm.flicker.launch.OpenAppFromLockscreenViaIntentTest
Change-Id: I4f330023b35ccf60be8aa154fc3f1c974b595a08

libraries/flicker/src/android/tools/common/flicker/config/AssertionTemplates.kt

diff --git a/libraries/flicker/src/android/tools/common/flicker/config/AssertionTemplates.kt b/libraries/flicker/src/android/tools/common/flicker/config/AssertionTemplates.kt
index 648e2a7..f95b4e9 100644
--- a/libraries/flicker/src/android/tools/common/flicker/config/AssertionTemplates.kt
+++ b/libraries/flicker/src/android/tools/common/flicker/config/AssertionTemplates.kt
@@ -61,21 +61,20 @@
 
 object AssertionTemplates {
     val ENTIRE_TRACE_ASSERTIONS =
-        listOf(
-                EntireScreenCoveredAlways(),
-                VisibleWindowsShownMoreThanOneConsecutiveEntry(),
-                // Temporarily ignore these layers which might be visible for a single entry
-                // and contain only view level changes during that entry (b/286054008)
-                VisibleLayersShownMoreThanOneConsecutiveEntry(
-                    ignore =
-                        listOf(
-                            ComponentNameMatcher.NOTIFICATION_SHADE,
-                            ComponentNameMatcher.VOLUME_DIALOG,
-                            ComponentNameMatcher.NAV_BAR,
-                        )
-                ),
-            )
-            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING })
+        mapOf(
+            EntireScreenCoveredAlways() to AssertionInvocationGroup.BLOCKING,
+            VisibleWindowsShownMoreThanOneConsecutiveEntry() to AssertionInvocationGroup.BLOCKING,
+            // Temporarily ignore these layers which might be visible for a single entry
+            // and contain only view level changes during that entry (b/286054008)
+            VisibleLayersShownMoreThanOneConsecutiveEntry(
+                ignore =
+                    listOf(
+                        ComponentNameMatcher.NOTIFICATION_SHADE,
+                        ComponentNameMatcher.VOLUME_DIALOG,
+                        ComponentNameMatcher.NAV_BAR,
+                    )
+            ) to AssertionInvocationGroup.NON_BLOCKING,
+        )
 
     val COMMON_ASSERTIONS =
         listOf(