github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ebean-new

Browse Source
This commit is contained in:
Roland Praml
2022-01-12 11:43:12 +01:00
parent 6e00b7c50b 7cfecb83a9
commit 35b59edb7e
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java
+4 -3
View File
@@ -27,16 +27,17 @@ 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", "${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
ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java
+8 -7
View File
@@ -50,30 +50,31 @@ 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");
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"));
}
}