Fix some unit test after upgrade to latest Jetty

jknack · jknack · commit 14507d00d16a · 2014-10-14T10:52:54.000-03:00
diff --git a/jooby-core/src/main/java/jooby/MediaType.java b/jooby-core/src/main/java/jooby/MediaType.java
@@ -373,7 +373,8 @@ public boolean matches(final MediaType that) {
         return true;
       }
       if (subtype.startsWith("*")) {
-        return subtype.substring(1).endsWith(that.subtype);
+        return that.subtype.endsWith(subtype.substring(2))
+            || that.subtype.endsWith(subtype.substring(1));
       }
     }
     return false;
@@ -425,7 +426,7 @@ public static MediaType valueOf(final String mediaType) {
       for (int i = 1; i < parts.length; i++) {
         String[] parameter = parts[i].split("=");
         if (parameter.length > 1) {
-          parameters.put(parameter[0].trim(), parameter[1].trim());
+          parameters.put(parameter[0].trim(), parameter[1].trim().toLowerCase());
         }
       }
     }
diff --git a/jooby-tests/src/test/java/jooby/AssetFeature.java b/jooby-tests/src/test/java/jooby/AssetFeature.java
@@ -15,8 +15,8 @@ public class AssetFeature extends ServerFeature {
   @Test
   public void jsAsset() throws Exception {
     HttpResponse response = Request.Get(uri("/assets/file.js").build()).execute().returnResponse();
-    assertEquals("application/javascript;charset=utf-8", response.getFirstHeader("Content-Type")
-        .getValue());
+    assertEquals("application/javascript; charset=utf-8", response.getFirstHeader("Content-Type")
+        .getValue().toLowerCase());
     assertEquals(200, response.getStatusLine().getStatusCode());
     String lastModified = response.getFirstHeader("Last-Modified").getValue();
 
@@ -29,8 +29,8 @@ public void jsAsset() throws Exception {
   @Test
   public void cssAsset() throws Exception {
     HttpResponse response = Request.Get(uri("/assets/file.css").build()).execute().returnResponse();
-    assertEquals("text/css;charset=utf-8", response.getFirstHeader("Content-Type")
-        .getValue());
+    assertEquals("text/css; charset=utf-8", response.getFirstHeader("Content-Type")
+        .getValue().toLowerCase());
     assertEquals(200, response.getStatusLine().getStatusCode());
     String lastModified = response.getFirstHeader("Last-Modified").getValue();
 

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,8 @@ public boolean matches(final MediaType that) {`
`373`	`373`	`return true;`
`374`	`374`	`}`
`375`	`375`	`if (subtype.startsWith("*")) {`
`376`		`- return subtype.substring(1).endsWith(that.subtype);`
	`376`	`+ return that.subtype.endsWith(subtype.substring(2))`
	`377`	`+ \|\| that.subtype.endsWith(subtype.substring(1));`
`377`	`378`	`}`
`378`	`379`	`}`
`379`	`380`	`return false;`
`@@ -425,7 +426,7 @@ public static MediaType valueOf(final String mediaType) {`
`425`	`426`	`for (int i = 1; i < parts.length; i++) {`
`426`	`427`	`String[] parameter = parts[i].split("=");`
`427`	`428`	`if (parameter.length > 1) {`
`428`		`- parameters.put(parameter[0].trim(), parameter[1].trim());`
	`429`	`+ parameters.put(parameter[0].trim(), parameter[1].trim().toLowerCase());`
`429`	`430`	`}`
`430`	`431`	`}`
`431`	`432`	`}`