From 5a3f7853a68cd56a2279c6af142dc89929e61ea1 Mon Sep 17 00:00:00 2001 From: bigjimlefou Date: Wed, 24 Nov 2021 21:44:04 +0100 Subject: [PATCH 1/4] Fix failing test on Windows platform. --- .../src/test/java/io/ebean/config/PropertiesWrapperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java index 98a64ad0b..904f82a70 100644 --- a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java +++ b/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java @@ -50,7 +50,7 @@ public class PropertiesWrapperTest { @Test public void testGetProperties() { - String home = System.getenv("HOME"); + String home = System.getProperty("user.home"); String tmpDir = System.getProperty("java.io.tmpdir"); Properties properties = new Properties(); From dd7e7711a8cd4de6c5fdb0052cb098be77ea269f Mon Sep 17 00:00:00 2001 From: bigjimlefou Date: Wed, 24 Nov 2021 21:45:22 +0100 Subject: [PATCH 2/4] Use of platform-specific specific file separator --- .../java/io/ebean/config/PropertiesWrapperTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java index 904f82a70..5301d0173 100644 --- a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java +++ b/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java @@ -52,28 +52,29 @@ public class PropertiesWrapperTest { String home = System.getProperty("user.home"); String tmpDir = System.getProperty("java.io.tmpdir"); + String fileSeparator = System.getProperty("file.separator"); Properties properties = new Properties(); properties.put("someBasic", "hello"); properties.put("someInt", "42"); properties.put("someDouble", "5.5"); - properties.put("somePath", "${HOME}/hello"); - properties.put("someSystemProp", "/aaa/${java.io.tmpdir}/bbb"); + properties.put("somePath", "${user.home}" + fileSeparator + "hello"); + properties.put("someSystemProp", fileSeparator + "aaa" + fileSeparator + "${java.io.tmpdir}" + fileSeparator + "bbb"); Properties evalCopy = Config.asConfiguration().eval(properties); PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", evalCopy, null); assertEquals(42, pw.getInt("someInt", 99)); assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D)))); - assertEquals(home + "/hello", pw.get("somePath", null)); - assertEquals("/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp")); + assertEquals(home + fileSeparator + "hello", pw.get("somePath", null)); + assertEquals(fileSeparator + "aaa" + fileSeparator + tmpDir + fileSeparator + "bbb", pw.get("someSystemProp")); pw = new PropertiesWrapper(evalCopy, null); assertEquals(42, pw.getInt("someInt", 99)); assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D)))); - assertEquals(home + "/hello", pw.get("somePath", null)); - assertEquals("/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp")); + assertEquals(home + fileSeparator + "hello", pw.get("somePath", null)); + assertEquals(fileSeparator + "aaa" + fileSeparator + tmpDir + fileSeparator + "bbb", pw.get("someSystemProp")); } } From 408b982eb34956df4aafddca9ea3c5bef98594ad Mon Sep 17 00:00:00 2001 From: bigjimlefou Date: Thu, 25 Nov 2021 21:30:25 +0100 Subject: [PATCH 3/4] Use of platform-specific specific file separator --- .../src/test/java/io/ebean/config/DatabaseConfigTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java index 143e3b19e..0ffd4d242 100644 --- a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java @@ -30,13 +30,13 @@ public class DatabaseConfigTest { String home = System.getenv("HOME"); Properties props = new Properties(); - props.setProperty("ddl.initSql", "${HOME}/initSql"); + props.setProperty("ddl.initSql", "${user.home}" + fileSeparator + "initSql"); DatabaseConfig config = new DatabaseConfig(); config.loadFromProperties(props); String ddlInitSql = config.getDdlInitSql(); - assertThat(ddlInitSql).isEqualTo(home+"/initSql"); + assertThat(ddlInitSql).isEqualTo(home + fileSeparator + "initSql"); } @Test From e92939a34d7b469f2ac1bccdd4f72df389975b06 Mon Sep 17 00:00:00 2001 From: bigjimlefou Date: Thu, 25 Nov 2021 21:31:18 +0100 Subject: [PATCH 4/4] Fix failing test on Windows platform --- .../src/test/java/io/ebean/config/DatabaseConfigTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java index 0ffd4d242..7ef7cc0f7 100644 --- a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java @@ -27,7 +27,8 @@ public class DatabaseConfigTest { @Test public void evalPropertiesInput() { - String home = System.getenv("HOME"); + String home = System.getProperty("user.home"); + String fileSeparator = System.getProperty("file.separator"); Properties props = new Properties(); props.setProperty("ddl.initSql", "${user.home}" + fileSeparator + "initSql");