Clean up testMaxConnectionsWithinThreads, close AsyncHttpClient#794

Author: Stephane Landelle

api/src/test/java/org/asynchttpclient/async/MaxConnectionsInThreads.java

@@ -16,17 +16,16 @@
  */
 package org.asynchttpclient.async;
 
-import static org.testng.Assert.*;
-
 import static org.asynchttpclient.async.util.TestUtils.findFreePort;
 import static org.asynchttpclient.async.util.TestUtils.newJettyHttpServer;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -58,12 +57,11 @@ public void testMaxConnectionsWithinThreads() throws InterruptedException {
                 .setMaxConnections(1).setMaxConnectionsPerHost(1).build();
 
         final CountDownLatch inThreadsLatch = new CountDownLatch(2);
-        final AtomicReference<Integer> failedRank = new AtomicReference<>(-1);
+        final AtomicInteger failedCount = new AtomicInteger();
 
         try (AsyncHttpClient client = getAsyncHttpClient(config)) {
             for (int i = 0; i < urls.length; i++) {
                 final String url = urls[i];
-                final int rank = i;
                 Thread t = new Thread() {
                     public void run() {
                         client.prepareGet(url).execute(new AsyncCompletionHandlerBase() {
@@ -77,7 +75,7 @@ public Response onCompleted(Response response) throws Exception {
                             @Override
                             public void onThrowable(Throwable t) {
                                 super.onThrowable(t);
-                                failedRank.set(rank);
+                                failedCount.incrementAndGet();
                                 inThreadsLatch.countDown();
                             }
                         });
@@ -88,13 +86,12 @@ public void onThrowable(Throwable t) {
 
             inThreadsLatch.await();
 
-            assertEquals(failedRank.get().intValue(), 1, "Max Connections should have been reached");
+            assertEquals(failedCount.get(), 1, "Max Connections should have been reached when launching from concurrent threads");
 
             final CountDownLatch notInThreadsLatch = new CountDownLatch(2);
-            failedRank.set(-1);
+            failedCount.set(0);
             for (int i = 0; i < urls.length; i++) {
                 final String url = urls[i];
-                final int rank = i;
                 client.prepareGet(url).execute(new AsyncCompletionHandlerBase() {
                     @Override
                     public Response onCompleted(Response response) throws Exception {
@@ -106,15 +103,15 @@ public Response onCompleted(Response response) throws Exception {
                     @Override
                     public void onThrowable(Throwable t) {
                         super.onThrowable(t);
-                        failedRank.set(rank);
+                        failedCount.incrementAndGet();
                         notInThreadsLatch.countDown();
                     }
                 });
             }
 
             notInThreadsLatch.await();
 
-            assertEquals(failedRank.get().intValue(), 1, "Max Connections should have been reached");
+            assertEquals(failedCount.get(), 1, "Max Connections should have been reached when launching from main thread");
         }
     }