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

Commit e6181b0c authored by Hugo Benichi's avatar Hugo Benichi
Browse files

Fix NetworkNotificationManagerTest 

The testNotificationsShownAndCleared test was not doing anything
because the list of notification to show was always empty.

This patch fixes this issue and actually makes the test loop on
non-empty collections, and also fixes another ordering issue in
assertions themselves, hidden until now by the first issue.

Bug: 32561414
Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
Merged-In: I4837b1175d7c9133e9156e33acaa1e7e3341cc62
Change-Id: Ia30587bd68a87b83b62f57eeeb28fef7d95dbf81

(cherry picked from commit f8b804be)
parent c01fbf0f

tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java

+4 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class NetworkNotificationManagerTest extends TestCase { 
        final int NETWORK_ID_BASE = 100;

        List<NotificationType> types = Arrays.asList(NotificationType.values());

        List<Integer> ids = new ArrayList<>(types.size());

        for (int i = 0; i < ids.size(); i++) {

        for (int i = 0; i < types.size(); i++) {

            ids.add(NETWORK_ID_BASE + i);

        }

        Collections.shuffle(ids);
@@ -101,9 +101,10 @@ public class NetworkNotificationManagerTest extends TestCase { 
            mManager.showNotification(ids.get(i), types.get(i), mWifiNai, mCellNai, null, false);

        }



        Collections.shuffle(ids);

        List<Integer> idsToClear = new ArrayList<>(ids);

        Collections.shuffle(idsToClear);

        for (int i = 0; i < ids.size(); i++) {

            mManager.clearNotification(ids.get(i));

            mManager.clearNotification(idsToClear.get(i));

        }



        for (int i = 0; i < ids.size(); i++) {