- Revision
- 931
- Author
- paul
- Date
- 2009-03-03 22:02:28 -0600 (Tue, 03 Mar 2009)
Log Message
patch from Damian Gajda for true internationalisation
Modified Paths
- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberValueConverterTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java
Added Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/guice/
Diff
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java (930 => 931)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java 2009-03-04 03:45:11 UTC (rev 930) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java 2009-03-04 04:02:28 UTC (rev 931) @@ -9,7 +9,10 @@ import static org.junit.Assert.fail; import java.beans.IntrospectionException; +import java.text.NumberFormat; import java.util.List; +import java.util.Locale; +import java.util.Properties; import ognl.OgnlException; @@ -38,7 +41,10 @@ @Test public void canConvertListsOfNumbers() throws OgnlException, IntrospectionException { - NumberListValueConverter converter = new NumberListValueConverter(new DefaultMessageResources()); + NumberListValueConverter converter = new NumberListValueConverter( + new DefaultMessageResources(), + new Properties(), + NumberFormat.getInstance(Locale.US)); assertCanConvertValueToList(converter, INTEGERS, "-1,-2,-3", Long.class, "listOfIntegers"); assertCanConvertValueToList(converter, LONGS, "1000,2000,3000", Long.class, "listOfLongs"); assertCanConvertValueToList(converter, DOUBLES, "0.10,0.200,0.300", Double.class, "listOfDoubles");
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberValueConverterTest.java (930 => 931)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberValueConverterTest.java 2009-03-04 03:45:11 UTC (rev 930) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberValueConverterTest.java 2009-03-04 04:02:28 UTC (rev 931) @@ -10,6 +10,9 @@ import org.junit.Test; import java.beans.IntrospectionException; +import java.text.NumberFormat; +import java.util.Locale; +import java.util.Properties; /** * @author Mauro Talevi @@ -33,7 +36,10 @@ @Test public void canConvertNumbers() throws OgnlException, IntrospectionException { - NumberValueConverter converter = new NumberValueConverter(new DefaultMessageResources()); + NumberValueConverter converter = new NumberValueConverter( + new DefaultMessageResources(), + new Properties(), + NumberFormat.getInstance(Locale.US)); assertCanConvertValueToNumber(converter, -1, "-1", Long.class); assertCanConvertValueToNumber(converter, -1E3, "-1,000", Long.class); assertCanConvertValueToNumber(converter, 1E3, "1000", Long.class);
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java (930 => 931)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java 2009-03-04 03:45:11 UTC (rev 930) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java 2009-03-04 04:02:28 UTC (rev 931) @@ -5,10 +5,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.List; +import java.util.Locale; +import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -92,7 +95,11 @@ }); FakeController fakeController = new FakeController(); - OgnlValueConverterFinder finder = new OgnlValueConverterFinder(new NumberValueConverter(MESSAGE_RESOURCES)); + OgnlValueConverterFinder finder = new OgnlValueConverterFinder( + new NumberValueConverter( + new DefaultMessageResources(), + new Properties(), + NumberFormat.getInstance(Locale.US))); ControllerDataBinder binder = new OgnlControllerDataBinder(finder, null, MONITOR); ErrorsContext errorsContext = new DefaultErrorsContext(null); binder.bind(request, null, errorsContext, fakeController);
To unsubscribe from this list please visit:
