Test clean up + Jetty 9.2.13 upgrade

Author: slandelle

client/src/test/java/org/asynchttpclient/AsyncStreamHandlerTest.java

@@ -16,12 +16,11 @@
 package org.asynchttpclient;
 
 import static org.asynchttpclient.Dsl.*;
-import static org.asynchttpclient.test.TestUtils.TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET;
+import static org.asynchttpclient.test.TestUtils.*;
 import static org.testng.Assert.*;
 import io.netty.handler.codec.http.HttpHeaders;
 
 import java.util.Arrays;
-import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -68,7 +67,7 @@ public void onThrowable(Throwable t) {
 
             HttpHeaders h = responseHeaders.get();
             assertNotNull(h, "No response headers");
-            assertEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET, "Unexpected content-type");
+            assertContentTypesEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
             assertNull(throwable.get(), "Unexpected exception");
         }
     }
@@ -106,7 +105,7 @@ public String onCompleted() throws Exception {
             String responseBody = f.get(10, TimeUnit.SECONDS);
             HttpHeaders h = responseHeaders.get();
             assertNotNull(h);
-            assertEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
+            assertContentTypesEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
             assertEquals(responseBody, RESPONSE);
         }
     }
@@ -147,7 +146,7 @@ public void onThrowable(Throwable t) {
             assertTrue(!bodyReceived.get(), "Interrupted not working");
             HttpHeaders h = responseHeaders.get();
             assertNotNull(h, "Should receive non null headers");
-            assertEquals(h.get(HttpHeaders.Names.CONTENT_TYPE).toLowerCase(Locale.ENGLISH), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET.toLowerCase(Locale.ENGLISH), "Unexpected content-type");
+            assertContentTypesEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
             assertNull(throwable.get(), "Should get an exception");
         }
     }
@@ -186,7 +185,7 @@ public void onThrowable(Throwable t) {
             String responseBody = f.get(5, TimeUnit.SECONDS);
             HttpHeaders h = responseHeaders.get();
             assertNotNull(h, "Should receive non null headers");
-            assertEquals(h.get(HttpHeaders.Names.CONTENT_TYPE).toLowerCase(Locale.ENGLISH), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET.toLowerCase(Locale.ENGLISH), "Unexpected content-type");
+            assertContentTypesEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
             assertNotNull(responseBody, "No response body");
             assertEquals(responseBody.trim(), RESPONSE, "Unexpected response body");
             assertNull(throwable.get(), "Unexpected exception");
@@ -256,7 +255,7 @@ public String onCompleted() throws Exception {
             String r = f.get(5, TimeUnit.SECONDS);
             HttpHeaders h = responseHeaders.get();
             assertNotNull(h, "Should receive non null headers");
-            assertEquals(h.get(HttpHeaders.Names.CONTENT_TYPE).toLowerCase(Locale.ENGLISH), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET.toLowerCase(Locale.ENGLISH), "Unexpected content-type");
+            assertContentTypesEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
             assertNotNull(r, "No response body");
             assertEquals(r.trim(), RESPONSE, "Unexpected response body");
 
@@ -287,7 +286,7 @@ public String onCompleted() throws Exception {
             f.get(5, TimeUnit.SECONDS);
             h = responseHeaders.get();
             assertNotNull(h, "Should receive non null headers");
-            assertEquals(h.get(HttpHeaders.Names.CONTENT_TYPE).toLowerCase(Locale.ENGLISH), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET.toLowerCase(Locale.ENGLISH), "Unexpected content-type");
+            assertContentTypesEquals(h.get(HttpHeaders.Names.CONTENT_TYPE), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
             assertNotNull(r, "No response body");
             assertEquals(r.trim(), RESPONSE, "Unexpected response body");
         }

client/src/test/java/org/asynchttpclient/BasicHttpTest.java

@@ -176,7 +176,7 @@ public void asyncContentTypeGETTest() throws Exception {
                 public Response onCompleted(Response response) throws Exception {
                     try {
                         assertEquals(response.getStatusCode(), 200);
-                        assertEquals(response.getContentType(), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
+                        assertContentTypesEquals(response.getContentType(), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
                     } finally {
                         l.countDown();
                     }
@@ -200,7 +200,7 @@ public void asyncHeaderGETTest() throws Exception {
                 public Response onCompleted(Response response) throws Exception {
                     try {
                         assertEquals(response.getStatusCode(), 200);
-                        assertEquals(response.getContentType(), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
+                        assertContentTypesEquals(response.getContentType(), TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET);
                     } finally {
                         l.countDown();
                     }

client/src/test/java/org/asynchttpclient/test/EchoHandler.java

@@ -29,7 +29,6 @@ public void handle(String pathInContext, Request request, HttpServletRequest htt
         if (request.getMethod().equalsIgnoreCase("OPTIONS")) {
             httpResponse.addHeader("Allow", "GET,HEAD,POST,OPTIONS,TRACE");
         }
-        ;
 
         Enumeration<?> e = httpRequest.getHeaderNames();
         String param;

client/src/test/java/org/asynchttpclient/test/TestUtils.java

@@ -24,6 +24,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -64,8 +65,8 @@ public class TestUtils {
 
     public static final String USER = "user";
     public static final String ADMIN = "admin";
-    public static final String TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET = "text/html; charset=UTF-8";
-    public static final String TEXT_HTML_CONTENT_TYPE_WITH_ISO_8859_1_CHARSET = "text/html; charset=ISO-8859-1";
+    public static final String TEXT_HTML_CONTENT_TYPE_WITH_UTF_8_CHARSET = "text/html;charset=UTF-8";
+    public static final String TEXT_HTML_CONTENT_TYPE_WITH_ISO_8859_1_CHARSET = "text/html;charset=ISO-8859-1";
     public static final File TMP_DIR = new File(System.getProperty("java.io.tmpdir"), "ahc-tests-" + UUID.randomUUID().toString().substring(0, 8));
     public static final byte[] PATTERN_BYTES = "FooBarBazQixFooBarBazQixFooBarBazQixFooBarBazQixFooBarBazQixFooBarBazQix".getBytes(Charset.forName("UTF-16"));
     public static final File LARGE_IMAGE_FILE;
@@ -340,4 +341,9 @@ public static File getClasspathFile(String file) throws FileNotFoundException {
             throw new FileNotFoundException(file);
         }
     }
+    
+    public static void assertContentTypesEquals(String actual, String expected) {
+        assertEquals(actual.replace("; ", "").toLowerCase(Locale.ENGLISH), expected.replace("; ", "").toLowerCase(Locale.ENGLISH), "Unexpected content-type");
+
+    }
 }

pom.xml

@@ -382,7 +382,7 @@
 		<logback.version>1.1.3</logback.version>
 		<log4j.version>1.2.17</log4j.version>
 		<testng.version>6.9.9</testng.version>
-		<jetty.version>9.2.11.v20150529</jetty.version>
+		<jetty.version>9.2.13.v20150730</jetty.version>
 		<tomcat.version>6.0.29</tomcat.version>
 		<commons-io.version>2.4</commons-io.version>
 		<commons-fileupload.version>1.3</commons-fileupload.version>