spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 00:39:01 +00:00
Code Issues Projects Releases Wiki Activity

reworked PropertyPlaceholderHelper

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1848 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Rob Harrop
2009-09-08 19:09:12 +00:00
parent 9e864c9343
commit f3606bf320
4 changed files with 1045 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.core/src/test/java/org/springframework/util/PropertyPlaceholderUtilsTests.java → org.springframework.core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
+19 -7
View File
@@ -22,7 +22,9 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/** @author Rob Harrop */
public class PropertyPlaceholderUtilsTests {
public class PropertyPlaceholderHelperTests {
private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}");
@Test
public void testWithProperties() {
@@ -30,7 +32,7 @@ public class PropertyPlaceholderUtilsTests {
Properties props = new Properties();
props.setProperty("foo", "bar");
assertEquals("foo=bar", PropertyPlaceholderUtils.replacePlaceholders(text, props));
assertEquals("foo=bar", this.helper.replacePlaceholders(text, props));
}
@Test
@@ -40,7 +42,7 @@ public class PropertyPlaceholderUtilsTests {
props.setProperty("foo", "bar");
props.setProperty("bar", "baz");
assertEquals("foo=bar,bar=baz", PropertyPlaceholderUtils.replacePlaceholders(text, props));
assertEquals("foo=bar,bar=baz", this.helper.replacePlaceholders(text, props));
}
@Test
@@ -50,7 +52,7 @@ public class PropertyPlaceholderUtilsTests {
props.setProperty("bar", "${baz}");
props.setProperty("baz", "bar");
assertEquals("foo=bar", PropertyPlaceholderUtils.replacePlaceholders(text, props));
assertEquals("foo=bar", this.helper.replacePlaceholders(text, props));
}
@Test
@@ -60,7 +62,7 @@ public class PropertyPlaceholderUtilsTests {
props.setProperty("bar", "bar");
props.setProperty("inner", "ar");
assertEquals("foo=bar", PropertyPlaceholderUtils.replacePlaceholders(text, props));
assertEquals("foo=bar", this.helper.replacePlaceholders(text, props));
}
@Test
@@ -68,7 +70,7 @@ public class PropertyPlaceholderUtilsTests {
String text = "foo=${foo}";
assertEquals("foo=bar",
PropertyPlaceholderUtils.replacePlaceholders(text, new PropertyPlaceholderUtils.PlaceholderResolver() {
this.helper.replacePlaceholders(text, new PropertyPlaceholderHelper.PlaceholderResolver() {
public String resolvePlaceholder(String placeholderName) {
if ("foo".equals(placeholderName)) {
@@ -87,6 +89,16 @@ public class PropertyPlaceholderUtilsTests {
Properties props = new Properties();
props.setProperty("foo", "bar");
assertEquals("foo=bar,bar=${bar}", PropertyPlaceholderUtils.replacePlaceholders(text, props));
assertEquals("foo=bar,bar=${bar}", this.helper.replacePlaceholders(text, props));
}
@Test(expected=IllegalArgumentException.class)
public void testUnresolvedPlaceholderAsError() {
String text = "foo=${foo},bar=${bar}";
Properties props = new Properties();
props.setProperty("foo", "bar");
PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", false);
assertEquals("foo=bar,bar=${bar}", helper.replacePlaceholders(text, props));
}
}