Merge "ConnectivityServiceTest: fix flaky testNetworkRequestMaximum" am: 1211941aa0 am: ca67954314

am: eced6cd14a

Change-Id: I53d0d6755c8e0be34db66da56efa483006e538ac

tests/net/java/com/android/server/ConnectivityServiceTest.java

@@ -121,7 +121,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BooleanSupplier;
 import java.util.function.Predicate;
 
 /**
@@ -3212,68 +3211,68 @@ public class ConnectivityServiceTest extends AndroidTestCase {
     }
 
     @SmallTest
-    public void testNetworkRequestMaximum() {
+    public void testNetworkCallbackMaximum() {
         final int MAX_REQUESTS = 100;
-        // Test that the limit is enforced when MAX_REQUESTS simultaneous requests are added.
+        final int CALLBACKS = 90;
+        final int INTENTS = 10;
+        assertEquals(MAX_REQUESTS, CALLBACKS + INTENTS);
+
         NetworkRequest networkRequest = new NetworkRequest.Builder().build();
-        ArrayList<NetworkCallback> networkCallbacks = new ArrayList<NetworkCallback>();
+        ArrayList<Object> registered = new ArrayList<>();
-        try {
-            for (int i = 0; i < MAX_REQUESTS; i++) {
-                NetworkCallback networkCallback = new NetworkCallback();
-                mCm.requestNetwork(networkRequest, networkCallback);
-                networkCallbacks.add(networkCallback);
-            }
-            fail("Registering " + MAX_REQUESTS + " NetworkRequests did not throw exception");
-        } catch (TooManyRequestsException expected) {}
-        for (NetworkCallback networkCallback : networkCallbacks) {
-            mCm.unregisterNetworkCallback(networkCallback);
-        }
-        networkCallbacks.clear();
 
-        try {
+        int j = 0;
-            for (int i = 0; i < MAX_REQUESTS; i++) {
+        while (j++ < CALLBACKS / 2) {
-                NetworkCallback networkCallback = new NetworkCallback();
+            NetworkCallback cb = new NetworkCallback();
-                mCm.registerNetworkCallback(networkRequest, networkCallback);
+            mCm.requestNetwork(networkRequest, cb);
-                networkCallbacks.add(networkCallback);
+            registered.add(cb);
-            }
+        }
-            fail("Registering " + MAX_REQUESTS + " NetworkCallbacks did not throw exception");
+        while (j++ < CALLBACKS) {
-        } catch (TooManyRequestsException expected) {}
+            NetworkCallback cb = new NetworkCallback();
-        for (NetworkCallback networkCallback : networkCallbacks) {
+            mCm.registerNetworkCallback(networkRequest, cb);
-            mCm.unregisterNetworkCallback(networkCallback);
+            registered.add(cb);
+        }
+        j = 0;
+        while (j++ < INTENTS / 2) {
+            PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("a" + j), 0);
+            mCm.requestNetwork(networkRequest, pi);
+            registered.add(pi);
+        }
+        while (j++ < INTENTS) {
+            PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("b" + j), 0);
+            mCm.registerNetworkCallback(networkRequest, pi);
+            registered.add(pi);
         }
-        networkCallbacks.clear();
 
-        ArrayList<PendingIntent> pendingIntents = new ArrayList<PendingIntent>();
+        // Test that the limit is enforced when MAX_REQUESTS simultaneous requests are added.
         try {
-            for (int i = 0; i < MAX_REQUESTS + 1; i++) {
+            mCm.requestNetwork(networkRequest, new NetworkCallback());
-                PendingIntent pendingIntent =
+            fail("Registering " + MAX_REQUESTS + " network requests did not throw exception");
-                        PendingIntent.getBroadcast(mContext, 0, new Intent("a" + i), 0);
+        } catch (TooManyRequestsException expected) {}
-                mCm.requestNetwork(networkRequest, pendingIntent);
+        try {
-                pendingIntents.add(pendingIntent);
+            mCm.registerNetworkCallback(networkRequest, new NetworkCallback());
-            }
+            fail("Registering " + MAX_REQUESTS + " network callbacks did not throw exception");
-            fail("Registering " + MAX_REQUESTS +
+        } catch (TooManyRequestsException expected) {}
-                    " PendingIntent NetworkRequests did not throw exception");
+        try {
+            mCm.requestNetwork(networkRequest,
+                PendingIntent.getBroadcast(mContext, 0, new Intent("c"), 0));
+            fail("Registering " + MAX_REQUESTS + " PendingIntent requests did not throw exception");
+        } catch (TooManyRequestsException expected) {}
+        try {
+            mCm.registerNetworkCallback(networkRequest,
+                PendingIntent.getBroadcast(mContext, 0, new Intent("d"), 0));
+            fail("Registering " + MAX_REQUESTS
+                    + " PendingIntent callbacks did not throw exception");
         } catch (TooManyRequestsException expected) {}
-        for (PendingIntent pendingIntent : pendingIntents) {
-            mCm.unregisterNetworkCallback(pendingIntent);
-        }
-        pendingIntents.clear();
 
-        try {
+        for (Object o : registered) {
-            for (int i = 0; i < MAX_REQUESTS + 1; i++) {
+            if (o instanceof NetworkCallback) {
-                PendingIntent pendingIntent =
+                mCm.unregisterNetworkCallback((NetworkCallback)o);
-                        PendingIntent.getBroadcast(mContext, 0, new Intent("a" + i), 0);
+            }
-                mCm.registerNetworkCallback(networkRequest, pendingIntent);
+            if (o instanceof PendingIntent) {
-                pendingIntents.add(pendingIntent);
+                mCm.unregisterNetworkCallback((PendingIntent)o);
             }
-            fail("Registering " + MAX_REQUESTS +
-                    " PendingIntent NetworkCallbacks did not throw exception");
-        } catch (TooManyRequestsException expected) {}
-        for (PendingIntent pendingIntent : pendingIntents) {
-            mCm.unregisterNetworkCallback(pendingIntent);
         }
-        pendingIntents.clear();
+        waitForIdle();
-        waitForIdle(5000);
 
         // Test that the limit is not hit when MAX_REQUESTS requests are added and removed.
         for (int i = 0; i < MAX_REQUESTS; i++) {
@@ -3281,23 +3280,23 @@ public class ConnectivityServiceTest extends AndroidTestCase {
             mCm.requestNetwork(networkRequest, networkCallback);
             mCm.unregisterNetworkCallback(networkCallback);
         }
-        waitForIdle();
+
         for (int i = 0; i < MAX_REQUESTS; i++) {
             NetworkCallback networkCallback = new NetworkCallback();
             mCm.registerNetworkCallback(networkRequest, networkCallback);
             mCm.unregisterNetworkCallback(networkCallback);
         }
-        waitForIdle();
+
         for (int i = 0; i < MAX_REQUESTS; i++) {
             PendingIntent pendingIntent =
-                    PendingIntent.getBroadcast(mContext, 0, new Intent("b" + i), 0);
+                    PendingIntent.getBroadcast(mContext, 0, new Intent("e" + i), 0);
             mCm.requestNetwork(networkRequest, pendingIntent);
             mCm.unregisterNetworkCallback(pendingIntent);
         }
-        waitForIdle();
+
         for (int i = 0; i < MAX_REQUESTS; i++) {
             PendingIntent pendingIntent =
-                    PendingIntent.getBroadcast(mContext, 0, new Intent("c" + i), 0);
+                    PendingIntent.getBroadcast(mContext, 0, new Intent("f" + i), 0);
             mCm.registerNetworkCallback(networkRequest, pendingIntent);
             mCm.unregisterNetworkCallback(pendingIntent);
         }