From dd7e7711a8cd4de6c5fdb0052cb098be77ea269f Mon Sep 17 00:00:00 2001 From: bigjimlefou Date: Wed, 24 Nov 2021 21:45:22 +0100 Subject: [PATCH] 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")); } }