Test fixes for windows path separators, line endings, more elaborate error messages

Author: altmind

jooby/src/main/resources/org/jooby/jooby.conf

@@ -16,7 +16,7 @@ application {
   # class = App.class.getName() 
 
   # tmpdir
-  tmpdir = ${java.io.tmpdir}/${application.name}
+  tmpdir = ${java.io.tmpdir}${file.separator}${application.name}
 
   # path (a.k.a. as contextPath)
   path = /

jooby/src/test/java/org/jooby/test/JoobyRunner.java

@@ -105,6 +105,7 @@ private void prepare(final Class<?> klass, final Class<?> server) throws Initial
       }
 
       app = (Jooby) appClass.newInstance();
+      app.throwBootstrapException();
       if (app instanceof ServerFeature) {
         int appport = ((ServerFeature) app).port;
         if (appport > 0) {

modules/coverage-report/src/test/java/org/jooby/jackson/JsonCustomMapperFeature.java

@@ -1,5 +1,6 @@
 package org.jooby.jackson;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
 import java.net.URISyntaxException;
@@ -31,12 +32,12 @@ public class JsonCustomMapperFeature extends ServerFeature {
 
   @Test
   public void get() throws URISyntaxException, Exception {
-    request()
-        .get("/members")
-        .expect("[ {\n" +
-            "  \"id\" : 1,\n" +
-            "  \"name\" : \"pablo\"\n" +
-            "} ]");
+      request().get("/members").expect(value ->
+              assertEquals("[ {\n" +
+                      "  \"id\" : 1,\n" +
+                      "  \"name\" : \"pablo\"\n" +
+                      "} ]", value.replaceAll("\r\n", "\n"))
+      );
   }
 
 }

modules/coverage-report/src/test/java/org/jooby/jackson/JsonDoWithFeature.java

@@ -10,6 +10,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 
+import static org.junit.Assert.assertEquals;
+
 @SuppressWarnings("unchecked")
 public class JsonDoWithFeature extends ServerFeature {
 
@@ -26,12 +28,12 @@ public class JsonDoWithFeature extends ServerFeature {
 
   @Test
   public void get() throws URISyntaxException, Exception {
-    request()
-        .get("/members")
-        .expect("[ {\n" +
-            "  \"id\" : 1,\n" +
-            "  \"name\" : \"pablo\"\n" +
-            "} ]");
+    request().get("/members").expect(value ->
+            assertEquals("[ {\n" +
+                    "  \"id\" : 1,\n" +
+                    "  \"name\" : \"pablo\"\n" +
+                    "} ]", value.replaceAll("\r\n", "\n"))
+    );
   }
 
 }

modules/coverage-report/src/test/java/org/jooby/whoops/WhoopsTest.java

@@ -47,7 +47,7 @@ public void shouldIgnoreMissingClass() {
 
   @Test
   public void locationOf() {
-    assertTrue(new File(Whoops.locationOf(Whoops.class)).exists());
+    assertTrue(Whoops.locationOf(Whoops.class) + " file does not exist", new File(Whoops.locationOf(Whoops.class)).exists());
 
     assertEquals("rt.jar", Whoops.locationOf(Object.class));
   }

modules/coverage-report/src/test/resources/assets.conf

@@ -1,8 +1,11 @@
 package org.jooby.assets;
 
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.hamcrest.core.StringStartsWith;
 import org.junit.Test;
 
 import com.typesafe.config.ConfigFactory;
@@ -204,14 +207,14 @@ public void inlineSourceMap() throws Exception {
                 "  color: $primary-color;\n" +
                 "}\n",
             ConfigFactory.empty());
-    assertTrue(output.startsWith(".foo {\n" +
-        "  color: #fff; }\n" +
-        "\n" +
-        "body {\n" +
-        "  font: 100% Helvetica, sans-serif;\n" +
-        "  color: #333; }\n" +
-        "\n" +
-        "/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiLi4vLi4v"));
+    assertThat(output, startsWith(".foo {\n" +
+            "  color: #fff; }\n" +
+            "\n" +
+            "body {\n" +
+            "  font: 100% Helvetica, sans-serif;\n" +
+            "  color: #333; }\n" +
+            "\n" +
+            "/*# sourceMappingURL=data:application/json;base64,ewoJInZlcnNpb24iOiAzLAoJImZpbGUiOiAiL")); // include up to "file": "
   }
 
   @Test

modules/jooby-assets-sass/src/test/java/org/jooby/assets/SassTest.java

@@ -17,7 +17,7 @@ public void requireSpriteElementPath() throws Exception {
 
   @Test
   public void cssPath() throws Exception {
-    assertEquals(Paths.get("target", "css", "sprite.css").toString(),
+    assertEquals(Paths.get("target", "css").toString() + "/sprite.css",
         new SvgSprites()
             .set("spritePath", Paths.get("target", "css").toString())
             .cssPath());
@@ -30,7 +30,7 @@ public void cssPath() throws Exception {
 
   @Test
   public void spritePath() throws Exception {
-    assertEquals(Paths.get("target", "css", "sprite.svg").toString(),
+    assertEquals(Paths.get("target", "css").toString() + "/sprite.svg",
         new SvgSprites()
             .set("spritePath", Paths.get("target", "css").toString())
             .spritePath());
@@ -43,7 +43,7 @@ public void spritePath() throws Exception {
 
   @Test
   public void spritePrefix() throws Exception {
-    assertEquals(Paths.get("target", "css", "p-sprite.svg").toString(),
+    assertEquals(Paths.get("target", "css").toString() + "/p-sprite.svg",
         new SvgSprites()
             .set("prefix", "p")
             .set("spritePath", Paths.get("target", "css").toString())
@@ -58,14 +58,14 @@ public void spritePrefix() throws Exception {
 
   @Test
   public void spriteName() throws Exception {
-    assertEquals(Paths.get("target", "css", "p-n-sprite.svg").toString(),
+    assertEquals(Paths.get("target", "css").toString() + "/p-n-sprite.svg",
         new SvgSprites()
             .set("prefix", "p")
             .set("name", "n")
             .set("spritePath", Paths.get("target", "css").toString())
             .spritePath());
 
-    assertEquals(Paths.get("target", "css", "n-sprite.svg").toString(),
+    assertEquals(Paths.get("target", "css").toString() + "/n-sprite.svg",
         new SvgSprites()
             .set("name", "n")
             .set("spritePath", Paths.get("target", "css").toString())
@@ -74,7 +74,7 @@ public void spriteName() throws Exception {
 
   @Test
   public void cssPrefix() throws Exception {
-    assertEquals(Paths.get("target", "css", "p-sprite.css").toString(),
+    assertEquals(Paths.get("target", "css").toString() + "/p-sprite.css",
         new SvgSprites()
             .set("prefix", "p")
             .set("spritePath", Paths.get("target", "css").toString())

modules/jooby-assets-svg-sprites/src/test/java/org/jooby/assets/SvgSpritesFileSetTest.java

@@ -81,7 +81,7 @@ public void summary() throws Exception {
 
     File dir = Paths.get("target", "summary").toFile();
     Map<String, List<File>> files = compiler.build("dev", dir);
-
+    String summary = compiler.summary(files, dir.toPath(), "dev", 1000, "Foo: bar").replaceAll("\\\\","/");
     assertEquals("Summary:\n"
             + "Pipeline: []\n"
             + "Time: 1s\n"
@@ -92,7 +92,7 @@ public void summary() throws Exception {
             + "          assets/home.css         8b\n"
             + "           assets/base.js        19b\n"
             + "           assets/home.js        19b\n",
-        compiler.summary(files, dir.toPath(), "dev", 1000, "Foo: bar"));
+        summary);
   }
 
   @Test