Fix tests

Author: slandelle

src/test/java/com/ning/http/client/async/AsyncProvidersBasicTest.java

@@ -18,10 +18,7 @@
 import static java.nio.charset.StandardCharsets.*;
 import static com.ning.http.util.DateUtils.millisTime;
 import static com.ning.http.util.MiscUtils.isNonEmpty;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -47,6 +44,7 @@
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.nio.channels.UnresolvedAddressException;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -996,27 +994,27 @@ public void onThrowable(Throwable t) {
         }
     }
 
-    @Test(groups = { "online", "default_provider", "async" })
+    @Test(groups = { "online", "default_provider", "async" }, expectedExceptions = { ConnectException.class, UnresolvedAddressException.class, UnknownHostException.class })
     public void asyncConnectInvalidHandlerHost() throws Throwable {
         try (AsyncHttpClient client = getAsyncHttpClient(null)) {
+
+            final AtomicReference<Throwable> e = new AtomicReference<>();
             final CountDownLatch l = new CountDownLatch(1);
 
             client.prepareGet("http://null.apache.org:9999/").execute(new AsyncCompletionHandlerAdapter() {
                 @Override
                 public void onThrowable(Throwable t) {
-                    if (t != null) {
-                        if (t.getClass().equals(ConnectException.class)) {
-                            l.countDown();
-                        } else if (t.getClass().equals(UnresolvedAddressException.class)) {
-                            l.countDown();
-                        }
-                    }
+                    e.set(t);
+                    l.countDown();
                 }
             });
 
             if (!l.await(TIMEOUT, TimeUnit.SECONDS)) {
                 Assert.fail("Timed out");
             }
+
+            assertNotNull(e.get());
+            throw e.get();
         }
     }
 

src/test/java/com/ning/http/client/ws/CloseCodeReasonMessageTest.java

@@ -117,8 +117,9 @@ public void onError(Throwable t) {
 
         latch.await();
     }
-    
-    @Test(timeOut = 60000)
+
+    // Netty would throw IllegalArgumentException, other providers IllegalStateException
+    @Test(timeOut = 60000, expectedExceptions = { IllegalStateException.class, IllegalArgumentException.class } )
     public void wrongStatusCode() throws Throwable {
         try (AsyncHttpClient client = getAsyncHttpClient(null)) {
             final CountDownLatch latch = new CountDownLatch(1);
@@ -147,11 +148,12 @@ public void onError(Throwable t) {
 
             latch.await();
             assertNotNull(throwable.get());
-            assertEquals(throwable.get().getClass(), IllegalStateException.class);
+            throw throwable.get();
         }
     }
 
-    @Test(timeOut = 60000)
+    // Netty would throw IllegalArgumentException, other providers IllegalStateException
+    @Test(timeOut = 60000, expectedExceptions = { IllegalStateException.class, IllegalArgumentException.class } )
     public void wrongProtocolCode() throws Throwable {
         try (AsyncHttpClient client = getAsyncHttpClient(null)) {
             final CountDownLatch latch = new CountDownLatch(1);
@@ -180,7 +182,7 @@ public void onError(Throwable t) {
 
             latch.await();
             assertNotNull(throwable.get());
-            assertEquals(throwable.get().getClass(), IllegalStateException.class);
+            throw throwable.get();
         }
     }
 }

src/test/java/com/ning/http/client/ws/TextMessageTest.java

@@ -24,6 +24,7 @@
 
 import java.io.IOException;
 import java.net.ConnectException;
+import java.net.UnknownHostException;
 import java.nio.channels.UnresolvedAddressException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -116,7 +117,7 @@ public void onEmptyListenerTest() throws Throwable {
         }
     }
 
-    @Test(timeOut = 60000, expectedExceptions = { ConnectException.class, UnresolvedAddressException.class })
+    @Test(timeOut = 60000, expectedExceptions = { ConnectException.class, UnresolvedAddressException.class, UnknownHostException.class })
     public void onFailureTest() throws Throwable {
         try (AsyncHttpClient c = getAsyncHttpClient(null)) {
             c.prepareGet("ws://abcdefg").execute(new WebSocketUpgradeHandler.Builder().build()).get();