Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 956c4a26 authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Remove Thread.sleep() calls" into udc-qpr-dev

parents 39759a9e a489f84e

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+9 −8
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import static android.service.notification.Adjustment.KEY_USER_SENTIMENT; 
import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;

import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;

import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;

import static android.service.notification.NotificationListenerService.REASON_CANCEL;

import static android.service.notification.NotificationListenerService.REASON_LOCKDOWN;

import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE;

import static android.service.notification.NotificationListenerService.Ranking.USER_SENTIMENT_NEUTRAL;
@@ -2009,10 +2010,10 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        final StatusBarNotification sbn = generateNotificationRecord(null).getSbn();

        mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", sbn.getId(),

                sbn.getNotification(), sbn.getUserId());

        Thread.sleep(1);  // make sure the system clock advances before the next step

        mTestableLooper.moveTimeForward(1);

        // THEN it is canceled

        mBinderService.cancelNotificationWithTag(PKG, PKG, "tag", sbn.getId(), sbn.getUserId());

        Thread.sleep(1);  // here too

        mTestableLooper.moveTimeForward(1);

        // THEN it is posted again (before the cancel has a chance to finish)

        mBinderService.enqueueNotificationWithTag(PKG, PKG, "tag", sbn.getId(),

                sbn.getNotification(), sbn.getUserId());
@@ -2303,7 +2304,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        notif.getNotification().flags |= Notification.FLAG_NO_CLEAR;

        mService.addNotification(notif);

        mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, 0,

                notif.getUserId(), 0);

                notif.getUserId(), REASON_CANCEL);

        waitForIdle();

        StatusBarNotification[] notifs =

                mBinderService.getActiveNotifications(notif.getSbn().getPackageName());
@@ -3041,7 +3042,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        notif.getNotification().flags |= Notification.FLAG_NO_CLEAR;

        mService.addNotification(notif);

        mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0,

                Notification.FLAG_ONGOING_EVENT, notif.getUserId(), 0);

                Notification.FLAG_ONGOING_EVENT, notif.getUserId(), REASON_CANCEL);

        waitForIdle();

        StatusBarNotification[] notifs =

                mBinderService.getActiveNotifications(notif.getSbn().getPackageName());
@@ -3069,7 +3070,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        notif.getNotification().flags |= Notification.FLAG_ONGOING_EVENT;

        mService.addNotification(notif);

        mService.cancelAllNotificationsInt(mUid, 0, PKG, null, 0, 0,

                notif.getUserId(), 0);

                notif.getUserId(), REASON_CANCEL);

        waitForIdle();

        StatusBarNotification[] notifs =

                mBinderService.getActiveNotifications(notif.getSbn().getPackageName());
@@ -12208,7 +12209,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { 
        mOnPermissionChangeListener.onOpChanged(

                AppOpsManager.OPSTR_POST_NOTIFICATION, PKG, 0);

        waitForIdle();

        Thread.sleep(600);

        mTestableLooper.moveTimeForward(500);

        waitForIdle();















        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);









@@ -12227,7 +12228,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













        mOnPermissionChangeListener.onOpChanged(















                AppOpsManager.OPSTR_POST_NOTIFICATION, PKG, 0);















        waitForIdle();













        Thread.sleep(600);













        mTestableLooper.moveTimeForward(500);















        waitForIdle();





























        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);










@@ -12261,7 +12262,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {



























        assertThat(mService.mNotificationList).hasSize(0);



























        Thread.sleep(600);













        mTestableLooper.moveTimeForward(500);















        waitForIdle();















        verify(mContext).sendBroadcastAsUser(any(), eq(UserHandle.of(0)), eq(null));















    }