You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/02/22 16:36:08 UTC
svn commit: r912616 -
/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
Author: doogie
Date: Mon Feb 22 15:36:07 2010
New Revision: 912616
URL: http://svn.apache.org/viewvc?rev=912616&view=rev
Log:
Change type of compare object to String.
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=912616&r1=912615&r2=912616&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 Mon Feb 22 15:36:07 2010
@@ -99,11 +99,11 @@
parserTest("currency", "a${price?currency(usd)}b", true, "a${price?currency(usd)}b");
}
- private static void fseTest(String label, String input, Map<String, Object> context, Object compare, boolean isEmpty) {
+ private static void fseTest(String label, String input, Map<String, Object> context, String compare, boolean isEmpty) {
fseTest(label, input, context, null, null, compare, isEmpty);
}
- private static void doFseTest(String label, String input, FlexibleStringExpander fse, Map<String, Object> context, TimeZone timeZone, Locale locale, Object compare, boolean isEmpty) {
+ private static void doFseTest(String label, String input, FlexibleStringExpander fse, Map<String, Object> context, TimeZone timeZone, Locale locale, String compare, boolean isEmpty) {
assertEquals("isEmpty:" + label, isEmpty, fse.isEmpty());
if (input == null) {
assertEquals("getOriginal():" + label, "", fse.getOriginal());
@@ -162,7 +162,7 @@
}
}
- private static void fseTest(String label, String input, Map<String, Object> context, TimeZone timeZone, Locale locale, Object compare, boolean isEmpty) {
+ private static void fseTest(String label, String input, Map<String, Object> context, TimeZone timeZone, Locale locale, String compare, boolean isEmpty) {
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(input);
doFseTest(label, input, fse, context, timeZone, locale, compare, isEmpty);
assertEquals("static expandString:" + label, compare, FlexibleStringExpander.expandString(input, context, timeZone, locale));