Fix test case for changed paths in config origins.

imeszaros · imeszaros · commit 36f84143c620 · 2021-11-25T14:36:58.000+01:00
diff --git a/jooby/src/test/java/io/jooby/EnvironmentTest.java b/jooby/src/test/java/io/jooby/EnvironmentTest.java
@@ -13,46 +13,51 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.BiConsumer;
+import java.util.function.Predicate;
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class EnvironmentTest {
 
   @Test
   public void defaultEnv() {
 
     env("foo", (env, conf) -> {
-      assertEquals("[dev]\n"
-          + "└── system properties\n"
-          + " └── env variables\n"
-          + "  └── classpath://env/foo/application.conf\n"
-          + "   └── defaults", env.toString());
+      assertEnvMatches(env,
+          "[dev]"::equals,
+          "└── system properties"::equals,
+          " └── env variables"::equals,
+          pathEndsMatch("env/foo/application.conf"),
+          "   └── defaults"::equals);
       assertEquals("[dev]", env.getActiveNames().toString());
       assertEquals(System.getProperty("user.dir"), conf.getString("user.dir"));
       assertEquals("bar", conf.getString("foo"));
       assertEquals(asList("a", "b", "c"), conf.getStringList("letters"));
     });
 
     env("foo", mapOf("application.env", "PROD"), (env, conf) -> {
-      assertEquals("[prod]\n"
-          + "└── system properties\n"
-          + " └── env variables\n"
-          + "  └── classpath://env/foo/application.prod.conf\n"
-          + "   └── classpath://env/foo/application.conf\n"
-          + "    └── defaults", env.toString());
+      assertEnvMatches(env,
+          "[prod]"::equals,
+          "└── system properties"::equals,
+          " └── env variables"::equals,
+          pathEndsMatch("env/foo/application.prod.conf"),
+          pathEndsMatch("env/foo/application.conf"),
+          "    └── defaults"::equals);
       assertEquals("[prod]", env.getActiveNames().toString());
       assertEquals("bazz", conf.getString("foo"));
       assertEquals(asList("a", "b", "c"), conf.getStringList("letters"));
     });
 
     env("foo", mapOf("application.env", "Test, bar"), (env, conf) -> {
-      assertEquals("[test, bar]\n"
-          + "└── system properties\n"
-          + " └── env variables\n"
-          + "  └── classpath://env/foo/application.test.conf\n"
-          + "   └── classpath://env/foo/application.bar.conf\n"
-          + "    └── defaults", env.toString());
+      assertEnvMatches(env,
+          "[test, bar]"::equals,
+          "└── system properties"::equals,
+          " └── env variables"::equals,
+          pathEndsMatch("env/foo/application.test.conf"),
+          pathEndsMatch("env/foo/application.bar.conf"),
+          "    └── defaults"::equals);
       assertEquals("[test, bar]", env.getActiveNames().toString());
       assertEquals("test", conf.getString("foo"));
       assertEquals(asList("d"), conf.getStringList("letters"));
@@ -79,12 +84,13 @@ public void envfromfs() {
         .loadEnvironment(new EnvironmentOptions().setBasedir(basedir).setActiveNames("prod"));
     assertEquals("bazz", env.getConfig().getString("foo"));
     System.out.println(env.toString());
-    assertEquals("[prod]\n"
-        + "└── system properties\n"
-        + " └── env variables\n"
-        + "  └── "+ reldir.resolve("application.prod.conf")+"\n"
-        + "   └── "+ reldir.resolve("application.conf")+"\n"
-        + "    └── defaults", env.toString());
+    assertEnvMatches(env,
+        "[prod]"::equals,
+        "└── system properties"::equals,
+        " └── env variables"::equals,
+        pathEndsMatch(reldir.resolve("application.prod.conf").toString()),
+        pathEndsMatch(reldir.resolve("application.conf").toString()),
+        "    └── defaults"::equals);
   }
 
   @Test
@@ -147,4 +153,17 @@ private Map<String, Object> mapOf(Object... values) {
     }
     return hash;
   }
+
+  private static Predicate<String> pathEndsMatch(String path) {
+    return line -> line.replaceAll("\\\\", "/").endsWith(path.replaceAll("\\\\", "/"));
+  }
+
+  @SafeVarargs
+  private static void assertEnvMatches(Environment environment, Predicate<String>... predicates) {
+    final String[] lines = environment.toString().split("\n");
+    assertEquals(lines.length, predicates.length);
+    for (int i = 0; i < predicates.length; ++i) {
+      assertTrue(predicates[i].test(lines[i]), "Predicate for line nr. " + i + " should succeed.");
+    }
+  }
 }
