Default values for properties in ini files

While this feature is not strictly needed, the patch contains some good code cleanups.  So it will be applied and then the default feature
removed in a subsequent commit.

1 files changed, 13 insertions, 0 deletions

diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/PropsTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/PropsTest.java
index f7c9ee1039..0151f3b61a 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/PropsTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/PropsTest.java
@@ -98,6 +98,19 @@ public class PropsTest
     }
 
     @Test
+    public void testSimpleExpandWithDefaults()
+    {
+        Props props = new Props();
+        props.setProperty("name","jetty",FROM_TEST);
+        props.setProperty("version","9.1",FROM_TEST);
+
+        assertThat(props.expand("port=8080"),is("port=8080"));
+        assertThat(props.expand("jdk=${java.version:=WRONG}"),is("jdk=" + System.getProperty("java.version")));
+        assertThat(props.expand("id=${name:=WRONG}-${version:=WRONG}"),is("id=jetty-9.1"));
+        assertThat(props.expand("id=${unknown:=UNKNOWN}-${wibble}"),is("id=UNKNOWN-${wibble}"));
+    }
+
+    @Test
     public void testNoExpandDoubleDollar()
     {
         Props props = new Props();