[waffle-scm] [730] trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters: Pulled up abstract value converter test.

Wed, 18 Jun 2008 01:26:49 -0700

Title: [waffle-scm] [730] trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters: Pulled up abstract value converter test.

Diff

Added: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java (0 => 730)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java	                        (rev 0)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java	2008-06-18 08:26:39 UTC (rev 730)
@@ -0,0 +1,34 @@
+package org.codehaus.waffle.bind.converters;
+
+import static java.util.Arrays.asList;
+
+import java.util.List;
+import java.util.Locale;
+
+import org.codehaus.waffle.i18n.MessageResourcesConfiguration;
+
+/**
+ * @author Mauro Talevi
+ */
+public abstract class AbstractValueConverterTest {
+
+    protected static final List<Integer> INTEGERS = asList(-1, -2, -3);
+    protected static final List<Long> LONGS = asList(1000L, 2000L, 3000L);
+    protected static final List<Double> DOUBLES = asList(0.1d, 0.2d, 0.3d);
+    protected static final List<Float> FLOATS = asList(0.1f, 0.2f, 0.3f);
+    protected static final List<String> STRINGS = asList("one", "two", "three");
+    protected static final List<String> MIXED_STRINGS = asList("0#.A", "1#.B");
+
+    protected MessageResourcesConfiguration configuration = new MessageResourcesConfiguration() {
+
+        public Locale getDefaultLocale() {
+            return Locale.UK;
+        }
+
+        public String getResourceBundleName() {
+            return "FakeResourceBundle";
+        }
+
+    };
+
+}

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/DateValueConverterTest.java (729 => 730)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/DateValueConverterTest.java	2008-06-18 08:16:13 UTC (rev 729)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/DateValueConverterTest.java	2008-06-18 08:26:39 UTC (rev 730)
@@ -21,31 +21,17 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Locale;
 import java.util.Properties;
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
-import org.codehaus.waffle.i18n.MessageResourcesConfiguration;
 import org.junit.Test;
 
 /**
  * @author Mauro Talevi
  */
-public class DateValueConverterTest {
+public class DateValueConverterTest extends AbstractValueConverterTest {
 
-    private MessageResourcesConfiguration configuration = new MessageResourcesConfiguration() {
-
-        public Locale getDefaultLocale() {
-            return Locale.UK;
-        }
-
-        public String getResourceBundleName() {
-            return "FakeResourceBundle";
-        }
-
-    };
-
     @Test
     public void canAccept() {
         AbstractValueConverter converter = new DateValueConverter(new DefaultMessageResources());

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/ListValueConverterTest.java (729 => 730)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/ListValueConverterTest.java	2008-06-18 08:16:13 UTC (rev 729)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/ListValueConverterTest.java	2008-06-18 08:26:39 UTC (rev 730)
@@ -1,46 +1,24 @@
 package org.codehaus.waffle.bind.converters;
 
 import static java.text.MessageFormat.format;
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.List;
-import java.util.Locale;
 
 import ognl.OgnlException;
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
-import org.codehaus.waffle.i18n.MessageResourcesConfiguration;
 import org.junit.Test;
 
 /**
- * 
  * @author Mauro Talevi
  */
-public class ListValueConverterTest {
+public class ListValueConverterTest extends AbstractValueConverterTest {
 
-    private static final List<Integer> INTEGERS = asList(-1,-2,-3);
-    private static final List<Long> LONGS = asList(1000L,2000L,3000L);
-    private static final List<Double> DOUBLES = asList(0.1d,0.2d,0.3d);
-    private static final List<Float> FLOATS = asList(0.1f,0.2f,0.3f);
-    private static final List<String> STRINGS = asList("one","two","three");
-    private static final List<String> MIXED_STRINGS = asList("0#.A", "1#.B");
-    
-    private MessageResourcesConfiguration configuration = new MessageResourcesConfiguration(){
-
-        public Locale getDefaultLocale() {
-            return Locale.UK;
-        }
-
-        public String getResourceBundleName() {
-            return "FakeResourceBundle";
-        }
-        
-    };
     @Test
     public void canAccept() {
         ListValueConverter converter = new ListValueConverter(new DefaultMessageResources());
@@ -51,7 +29,7 @@
     public void canConvertLists() throws OgnlException {
         DefaultMessageResources resources = new DefaultMessageResources(configuration);
         ListValueConverter converter = new ListValueConverter(resources);
-        //Note:  no conversion is done from String to Numbers and the assertion is done on the string representation
+        // Note: no conversion is done from String to Numbers and the assertion is done on the string representation
         assertCanConvertValueToList(converter, INTEGERS, "-1,-2,-3");
         assertCanConvertValueToList(converter, LONGS, "1000,2000,3000");
         assertCanConvertValueToList(converter, DOUBLES, "0.1,0.2,0.3");
@@ -74,7 +52,7 @@
         assertEmptyList(converter, null);
         assertEmptyList(converter, "");
         assertEmptyList(converter, " ");
-     }
+    }
 
     private void assertEmptyList(ListValueConverter converter, String value) {
         List<?> list = (List<?>) converter.convertValue("property-name", value, List.class);
@@ -85,36 +63,36 @@
     @Test
     public void canFailConversionWithCustomErrorMessages() {
         DefaultMessageResources resources = new DefaultMessageResources(configuration);
-        ListValueConverter converter = new ListValueConverter(resources){
+        ListValueConverter converter = new ListValueConverter(resources) {
 
             @Override
             protected Object convertMissingValue(String key, String defaultMessage, Object... parameters) {
-               throw newBindException(key, defaultMessage, parameters);
+                throw newBindException(key, defaultMessage, parameters);
             }
         };
         try {
             converter.convertValue("property-name", null, List.class);
             fail("Expected BindException");
-        } catch ( BindException e) {
-            assertEquals(format(resources.getMessage(ListValueConverter.BIND_ERROR_LIST_KEY), "property-name"), e.getMessage());
+        } catch (BindException e) {
+            assertEquals(format(resources.getMessage(ListValueConverter.BIND_ERROR_LIST_KEY), "property-name"), e
+                    .getMessage());
         }
-     }
+    }
 
     @Test
     public void canFailConversionWithDefaultErrorMessages() {
-        ListValueConverter converter = new ListValueConverter(new DefaultMessageResources()){
+        ListValueConverter converter = new ListValueConverter(new DefaultMessageResources()) {
             @Override
             protected Object convertMissingValue(String key, String defaultMessage, Object... parameters) {
-               throw newBindException(key, defaultMessage, parameters);
+                throw newBindException(key, defaultMessage, parameters);
             }
         };
         try {
             converter.convertValue("property-name", null, List.class);
             fail("Expected BindException");
-        } catch ( BindException e) {
+        } catch (BindException e) {
             assertEquals(format(ListValueConverter.DEFAULT_LIST_MESSAGE, "property-name"), e.getMessage());
         }
-     }
+    }
 
 }
-

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java (729 => 730)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java	2008-06-18 08:16:13 UTC (rev 729)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java	2008-06-18 08:26:39 UTC (rev 730)
@@ -1,7 +1,6 @@
 package org.codehaus.waffle.bind.converters;
 
 import static java.text.MessageFormat.format;
-import static java.util.Arrays.asList;
 import static org.codehaus.waffle.testmodel.FakeControllerWithListMethods.methodParameterType;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,39 +10,18 @@
 
 import java.beans.IntrospectionException;
 import java.util.List;
-import java.util.Locale;
 
 import ognl.OgnlException;
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
-import org.codehaus.waffle.i18n.MessageResourcesConfiguration;
 import org.junit.Test;
 
 /**
- * 
  * @author Mauro Talevi
  */
-public class NumberListValueConverterTest {
+public class NumberListValueConverterTest extends AbstractValueConverterTest {
 
-    private static final List<Integer> INTEGERS = asList(-1,-2,-3);
-    private static final List<Long> LONGS = asList(1000L,2000L,3000L);
-    private static final List<Double> DOUBLES = asList(0.1d,0.2d,0.3d);
-    private static final List<Float> FLOATS = asList(0.1f,0.2f,0.3f);
-    private static final List<String> STRINGS = asList("one","two","three");
-
-    private MessageResourcesConfiguration configuration = new MessageResourcesConfiguration(){
-
-        public Locale getDefaultLocale() {
-            return Locale.UK;
-        }
-
-        public String getResourceBundleName() {
-            return "FakeResourceBundle";
-        }
-        
-    };
-
     @Test
     public void canAccept() throws IntrospectionException {
         NumberListValueConverter converter = new NumberListValueConverter(new DefaultMessageResources());
@@ -60,11 +38,12 @@
         NumberListValueConverter converter = new NumberListValueConverter(resources);
         assertCanConvertValueToList(converter, INTEGERS, "-1,-2,-3", Long.class, "listOfIntegers");
         assertCanConvertValueToList(converter, LONGS, "1000,2000,3000", Long.class, "listOfLongs");
-        assertCanConvertValueToList(converter, DOUBLES, "0.1,0.2,0.3", Double.class, "listOfDoubles");
-        assertCanConvertValueToList(converter, FLOATS, "0.1,0.2,0.3", Double.class, "listOfFloats");
+        assertCanConvertValueToList(converter, DOUBLES, "0.10,0.200,0.300", Double.class, "listOfDoubles");
+        assertCanConvertValueToList(converter, FLOATS, "0.10,0.200,0.300", Double.class, "listOfFloats");
     }
 
-    @Test //TODO decide if this behaviour is appropriate or if a bind exception should be thrown
+    @Test
+    // TODO decide if this behaviour is appropriate or if a bind exception should be thrown
     public void canReturnListOfStringsIfParsingFails() throws OgnlException, IntrospectionException {
         DefaultMessageResources resources = new DefaultMessageResources(configuration);
         NumberListValueConverter converter = new NumberListValueConverter(resources);
@@ -72,7 +51,8 @@
     }
 
     @SuppressWarnings("unchecked")
-    private void assertCanConvertValueToList(NumberListValueConverter converter, List<?> expected, String value, Class<?> expectedType, String methodName) throws IntrospectionException {
+    private void assertCanConvertValueToList(NumberListValueConverter converter, List<?> expected, String value,
+            Class<?> expectedType, String methodName) throws IntrospectionException {
         List<?> actual = (List<?>) converter.convertValue("property-name", value, methodParameterType(methodName));
         assertEquals(expected.toString(), actual.toString());
         assertTrue(expectedType.isAssignableFrom(actual.get(0).getClass()));
@@ -84,7 +64,7 @@
         assertEmptyList(converter, null);
         assertEmptyList(converter, "");
         assertEmptyList(converter, " ");
-     }
+    }
 
     private void assertEmptyList(NumberListValueConverter converter, String value) {
         List<?> list = (List<?>) converter.convertValue("property-name", value, List.class);
@@ -95,36 +75,36 @@
     @Test
     public void canFailConversionWithCustomErrorMessages() {
         DefaultMessageResources resources = new DefaultMessageResources(configuration);
-        NumberListValueConverter converter = new NumberListValueConverter(resources){
+        NumberListValueConverter converter = new NumberListValueConverter(resources) {
 
             @Override
             protected Object convertMissingValue(String key, String defaultMessage, Object... parameters) {
-               throw newBindException(key, defaultMessage, parameters);
+                throw newBindException(key, defaultMessage, parameters);
             }
         };
         try {
             converter.convertValue("property-name", null, List.class);
             fail("Expected BindException");
-        } catch ( BindException e) {
-            assertEquals(format(resources.getMessage(NumberListValueConverter.BIND_ERROR_LIST_KEY), "property-name"), e.getMessage());
+        } catch (BindException e) {
+            assertEquals(format(resources.getMessage(NumberListValueConverter.BIND_ERROR_LIST_KEY), "property-name"), e
+                    .getMessage());
         }
-     }
+    }
 
     @Test
     public void canFailConversionWithDefaultErrorMessages() {
-        NumberListValueConverter converter = new NumberListValueConverter(new DefaultMessageResources()){
+        NumberListValueConverter converter = new NumberListValueConverter(new DefaultMessageResources()) {
             @Override
             protected Object convertMissingValue(String key, String defaultMessage, Object... parameters) {
-               throw newBindException(key, defaultMessage, parameters);
+                throw newBindException(key, defaultMessage, parameters);
             }
         };
         try {
             converter.convertValue("property-name", null, List.class);
             fail("Expected BindException");
-        } catch ( BindException e) {
+        } catch (BindException e) {
             assertEquals(format(NumberListValueConverter.DEFAULT_LIST_MESSAGE, "property-name"), e.getMessage());
         }
-     }
+    }
 
 }
-

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to