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

Merge "Update verifications depending on a missing #equals()" into tm-dev

Browse Source
This commit is contained in:
Julia Reynolds
2022-05-12 02:03:28 +00:00
committed by Android (Google) Code Review
parent 82b7fd414d d513f076f5
commit da09f19628
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
View File

@@ -294,7 +294,8 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
verify(mPresenter).updateNotificationViews(any()); verify(mPresenter).updateNotificationViews(any());
verify(mEntryListener).onEntryRemoved( verify(mEntryListener).onEntryRemoved(
eq(mEntry), any(), eq(false) /* removedByUser */, eq(UNDEFINED_DISMISS_REASON)); argThat(matchEntryOnKey()), any(),
eq(false) /* removedByUser */, eq(UNDEFINED_DISMISS_REASON));
verify(mRow).setRemoved(); verify(mRow).setRemoved();
assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey())); assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
@@ -319,8 +320,8 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
mEntryManager.removeNotification("not_a_real_key", mRankingMap, UNDEFINED_DISMISS_REASON); mEntryManager.removeNotification("not_a_real_key", mRankingMap, UNDEFINED_DISMISS_REASON);
verify(mEntryListener, never()).onEntryRemoved( verify(mEntryListener, never()).onEntryRemoved(argThat(matchEntryOnKey()), any(),
eq(mEntry), any(), eq(false) /* removedByUser */, eq(UNDEFINED_DISMISS_REASON)); eq(false) /* removedByUser */, eq(UNDEFINED_DISMISS_REASON));
} }
/** Regression test for b/201097913. */ /** Regression test for b/201097913. */
@@ -333,10 +334,10 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// Verify that only the listener for the NEW pipeline is notified. // Verify that only the listener for the NEW pipeline is notified.
// Old pipeline: // Old pipeline:
verify(mEntryListener, never()).onEntryRemoved( verify(mEntryListener, never()).onEntryRemoved(
argThat(matchEntryOnSbn()), any(), anyBoolean(), anyInt()); argThat(matchEntryOnKey()), any(), anyBoolean(), anyInt());
// New pipeline: // New pipeline:
verify(mNotifCollectionListener).onEntryRemoved( verify(mNotifCollectionListener).onEntryRemoved(
argThat(matchEntryOnSbn()), anyInt()); argThat(matchEntryOnKey()), anyInt());
} }
@Test @Test
@@ -457,7 +458,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// THEN the notification is retained // THEN the notification is retained
assertNotNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey())); assertNotNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener, never()).onEntryRemoved( verify(mEntryListener, never()).onEntryRemoved(
eq(mEntry), any(), eq(false), eq(UNDEFINED_DISMISS_REASON)); argThat(matchEntryOnKey()), any(), eq(false), eq(UNDEFINED_DISMISS_REASON));
} }
@Test @Test
@@ -476,7 +477,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// THEN the notification is removed // THEN the notification is removed
assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey())); assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener).onEntryRemoved( verify(mEntryListener).onEntryRemoved(
eq(mEntry), any(), eq(false), eq(UNDEFINED_DISMISS_REASON)); argThat(matchEntryOnKey()), any(), eq(false), eq(UNDEFINED_DISMISS_REASON));
} }
@Test @Test
@@ -541,7 +542,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// GIVEN interceptor that intercepts that entry // GIVEN interceptor that intercepts that entry
when(mRemoveInterceptor.onNotificationRemoveRequested( when(mRemoveInterceptor.onNotificationRemoveRequested(
eq(mEntry.getKey()), eq(mEntry), anyInt())) eq(mEntry.getKey()), argThat(matchEntryOnKey()), anyInt()))
.thenReturn(true); .thenReturn(true);
// WHEN the notification is removed // WHEN the notification is removed
@@ -549,7 +550,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// THEN the interceptor intercepts & the entry is not removed & no listeners are called // THEN the interceptor intercepts & the entry is not removed & no listeners are called
assertNotNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey())); assertNotNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener, never()).onEntryRemoved(eq(mEntry), verify(mEntryListener, never()).onEntryRemoved(argThat(matchEntryOnKey()),
any(NotificationVisibility.class), anyBoolean(), eq(UNDEFINED_DISMISS_REASON)); any(NotificationVisibility.class), anyBoolean(), eq(UNDEFINED_DISMISS_REASON));
} }
@@ -560,7 +561,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// GIVEN interceptor that doesn't intercept // GIVEN interceptor that doesn't intercept
when(mRemoveInterceptor.onNotificationRemoveRequested( when(mRemoveInterceptor.onNotificationRemoveRequested(
eq(mEntry.getKey()), eq(mEntry), anyInt())) eq(mEntry.getKey()), argThat(matchEntryOnKey()), anyInt()))
.thenReturn(false); .thenReturn(false);
// WHEN the notification is removed // WHEN the notification is removed
@@ -568,7 +569,7 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
// THEN the interceptor intercepts & the entry is not removed & no listeners are called // THEN the interceptor intercepts & the entry is not removed & no listeners are called
assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey())); assertNull(mEntryManager.getActiveNotificationUnfiltered(mSbn.getKey()));
verify(mEntryListener, atLeastOnce()).onEntryRemoved(eq(mEntry), verify(mEntryListener, atLeastOnce()).onEntryRemoved(argThat(matchEntryOnKey()),
any(NotificationVisibility.class), anyBoolean(), eq(UNDEFINED_DISMISS_REASON)); any(NotificationVisibility.class), anyBoolean(), eq(UNDEFINED_DISMISS_REASON));
} }
@@ -663,9 +664,8 @@ public class NotificationEntryManagerTest extends SysuiTestCase {
PendingIntent.FLAG_IMMUTABLE)).build(); PendingIntent.FLAG_IMMUTABLE)).build();
} }
// TODO(b/201321631): Update more tests to use this function instead of eq(mEntry). private ArgumentMatcher<NotificationEntry> matchEntryOnKey() {
private ArgumentMatcher<NotificationEntry> matchEntryOnSbn() { return e -> e.getKey().equals(mEntry.getKey());
return e -> e.getSbn().equals(mSbn);
} }
private static class FakeNotificationLifetimeExtender implements NotificationLifetimeExtender { private static class FakeNotificationLifetimeExtender implements NotificationLifetimeExtender {