Merge "Fix mocked HighPriorityProvider calls in test" into rvc-dev am: c4c9c0d554 am: 1d93ad8f8b am: 2c41b9ab98

Change-Id: I304f63e8abafd95335523779704dd467eab5aab7

1 files changed, 8 insertions, 2 deletions

diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java
index 4f481081855f..f54252effdd3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.java
@@ -176,6 +176,7 @@ public class KeyguardCoordinatorTest extends SysuiTestCase {
                 .setKey(mEntry.getKey())
                 .setImportance(IMPORTANCE_MIN)
                 .build());
+        when(mHighPriorityProvider.isHighPriority(mEntry)).thenReturn(false);
 
         // THEN filter out the entry
         assertTrue(mKeyguardFilter.shouldFilterOut(mEntry, 0));
@@ -197,7 +198,8 @@ public class KeyguardCoordinatorTest extends SysuiTestCase {
                 .setImportance(IMPORTANCE_MIN)
                 .build());
 
-        // WHEN its parent has a summary that exceeds threshold to show on lockscreen
+        // WHEN its parent does exceed threshold tot show on the lockscreen
+        when(mHighPriorityProvider.isHighPriority(parent)).thenReturn(true);
         parent.setSummary(new NotificationEntryBuilder()
                 .setImportance(IMPORTANCE_HIGH)
                 .build());
@@ -205,7 +207,8 @@ public class KeyguardCoordinatorTest extends SysuiTestCase {
         // THEN don't filter out the entry
         assertFalse(mKeyguardFilter.shouldFilterOut(entryWithParent, 0));
 
-        // WHEN its parent has a summary that doesn't exceed threshold to show on lockscreen
+        // WHEN its parent doesn't exceed threshold to show on lockscreen
+        when(mHighPriorityProvider.isHighPriority(parent)).thenReturn(false);
         parent.setSummary(new NotificationEntryBuilder()
                 .setImportance(IMPORTANCE_MIN)
                 .build());
@@ -248,5 +251,8 @@ public class KeyguardCoordinatorTest extends SysuiTestCase {
                 .thenReturn(true);
 
         // notification doesn't have a summary
+
+        // notification is high priority, so it shouldn't be filtered
+        when(mHighPriorityProvider.isHighPriority(mEntry)).thenReturn(true);
     }
 }