Author: doogie
Date: Sun Feb 21 01:28:27 2010
New Revision: 912274
URL: http://svn.apache.org/viewvc?rev=912274&view=rev
Log:
Remove local compare object.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=912274&r1=912273&r2=912274&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
Sun Feb 21 01:28:27 2010
@@ -36,30 +36,29 @@
public void testFlexibleStringExpander() {
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(null);
assertTrue("null FlexibleStringExpander", fse.isEmpty());
- String compare = "Hello World!";
- fse = FlexibleStringExpander.getInstance(compare);
- assertEquals("null context", compare, fse.expandString(null));
+ fse = FlexibleStringExpander.getInstance("Hello World!");
+ assertEquals("null context", "Hello World!", fse.expandString(null));
Map<String, Object> testMap = new HashMap<String, Object>();
testMap.put("var", "World");
fse = FlexibleStringExpander.getInstance("Hello ${var}!");
- assertEquals("simple replacement", compare, fse.expandString(testMap));
+ assertEquals("simple replacement", "Hello World!",
fse.expandString(testMap));
testMap.put("nested", "Hello ${var}");
fse = FlexibleStringExpander.getInstance("${nested}!");
- assertEquals("hidden (runtime) nested replacement", compare,
fse.expandString(testMap));
+ assertEquals("hidden (runtime) nested replacement", "Hello World!",
fse.expandString(testMap));
fse = FlexibleStringExpander.getInstance("${'Hello ${var}'}!");
- assertEquals("visible nested replacement", compare,
fse.expandString(testMap));
+ assertEquals("visible nested replacement", "Hello World!",
fse.expandString(testMap));
fse = FlexibleStringExpander.getInstance("${bsh:return \"Hello \" +
var + \"!\";}");
- assertEquals("bsh: script", compare, fse.expandString(testMap));
+ assertEquals("bsh: script", "Hello World!", fse.expandString(testMap));
fse = FlexibleStringExpander.getInstance("${groovy:return \"Hello \" +
var + \"!\";}");
- assertEquals("groovy: script", compare, fse.expandString(testMap));
+ assertEquals("groovy: script", "Hello World!",
fse.expandString(testMap));
testMap.put("testMap", testMap);
fse = FlexibleStringExpander.getInstance("Hello ${testMap.var}!");
- assertEquals("UEL integration: Map", compare,
fse.expandString(testMap));
+ assertEquals("UEL integration: Map", "Hello World!",
fse.expandString(testMap));
List<String> testList = new ArrayList<String>();
testList.add("World");
testMap.put("testList", testList);
fse = FlexibleStringExpander.getInstance("Hello ${testList[0]}!");
- assertEquals("UEL integration: List", compare,
fse.expandString(testMap));
+ assertEquals("UEL integration: List", "Hello World!",
fse.expandString(testMap));
fse = FlexibleStringExpander.getInstance("This is an \\${escaped}
expression");
assertEquals("Escaped expression", "This is an ${escaped} expression",
fse.expandString(testMap));
}