commit 636c379f2e2af3a4ba9d58b43ab72929ab9a0120
author Ned Burns <pixel@google.com> Wed Sep 11 16:59:07 2019 -0400
committer Ned Burns <pixel@google.com> Fri Sep 13 17:43:24 2019 -0400
tree b7dd60be312059a1996acf9a4bf1a62b812ee87a
parent 3eb2e312d893e60c764b11fd8c757ed856061563

Move remaining tests over to using NotificationEntryBuilder

Remove the need for the dreaded NotificationEntry.buildForTest().

Test: atest
Change-Id: Ic9938acc729da2dfa806f2ecf1f3fe4577b46cd2

packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceNotificationListenerTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceNotificationListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceNotificationListenerTest.java
index 5943b02..212c93d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceNotificationListenerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceNotificationListenerTest.java
@@ -17,19 +17,17 @@
 package com.android.systemui;
 
 import static com.android.systemui.ForegroundServiceLifetimeExtender.MIN_FGS_TIME_MS;
+import static com.android.systemui.statusbar.NotificationEntryHelper.modifySbn;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import android.app.Notification;
-import android.service.notification.NotificationListenerService.Ranking;
-import android.service.notification.StatusBarNotification;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.systemui.statusbar.NotificationEntryBuilder;
 import com.android.systemui.statusbar.notification.collection.NotificationEntry;
 
 import org.junit.Before;
@@ -40,7 +38,6 @@
 @SmallTest
 public class ForegroundServiceNotificationListenerTest extends SysuiTestCase {
     private ForegroundServiceLifetimeExtender mExtender = new ForegroundServiceLifetimeExtender();
-    private StatusBarNotification mSbn;
     private NotificationEntry mEntry;
     private Notification mNotif;
 
@@ -52,10 +49,9 @@
                 .setContentText("Text")
                 .build();
 
-        mSbn = mock(StatusBarNotification.class);
-        when(mSbn.getNotification()).thenReturn(mNotif);
-
-        mEntry = new NotificationEntry(mSbn, mock(Ranking.class));
+        mEntry = new NotificationEntryBuilder()
+                .setNotification(mNotif)
+                .build();
     }
 
     /**
@@ -66,21 +62,27 @@
         // Extend the lifetime of a FGS notification iff it has not been visible
         // for the minimum time
         mNotif.flags |= Notification.FLAG_FOREGROUND_SERVICE;
-        when(mSbn.getPostTime()).thenReturn(System.currentTimeMillis());
+        modifySbn(mEntry)
+                .setPostTime(System.currentTimeMillis())
+                .build();
         assertTrue(mExtender.shouldExtendLifetime(mEntry));
     }
 
     @Test
     public void testShouldExtendLifetime_shouldNot_foreground() {
         mNotif.flags |= Notification.FLAG_FOREGROUND_SERVICE;
-        when(mSbn.getPostTime()).thenReturn(System.currentTimeMillis() - MIN_FGS_TIME_MS - 1);
+        modifySbn(mEntry)
+                .setPostTime(System.currentTimeMillis() - MIN_FGS_TIME_MS - 1)
+                .build();
         assertFalse(mExtender.shouldExtendLifetime(mEntry));
     }
 
     @Test
     public void testShouldExtendLifetime_shouldNot_notForeground() {
         mNotif.flags = 0;
-        when(mSbn.getPostTime()).thenReturn(System.currentTimeMillis() - MIN_FGS_TIME_MS - 1);
+        modifySbn(mEntry)
+                .setPostTime(System.currentTimeMillis() - MIN_FGS_TIME_MS - 1)
+                .build();
         assertFalse(mExtender.shouldExtendLifetime(mEntry));
     }
 }