annotation driven number formatting with default number formatting rules

org.springframework.context/src/test/java/org/springframework/format/number/IntegerFormatterTests.java

@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.format.number;
-
-import static org.junit.Assert.assertEquals;
-
-import java.text.ParseException;
-import java.util.Locale;
-
-import org.junit.Test;
-import org.springframework.format.number.IntegerFormatter;
-
-/**
- * @author Keith Donald
- */
-public class IntegerFormatterTests {
-
-	private IntegerFormatter formatter = new IntegerFormatter();
-
-	@Test
-	public void formatValue() {
-		assertEquals("23", formatter.print(23L, Locale.US));
-	}
-
-	@Test
-	public void parseValue() throws ParseException {
-		assertEquals((Long) 2356L, formatter.parse("2356", Locale.US));
-	}
-
-	@Test(expected = ParseException.class)
-	public void parseBogusValue() throws ParseException {
-		formatter.parse("bogus", Locale.US);
-	}
-
-	@Test(expected = ParseException.class)
-	public void parsePercentValueNotLenientFailure() throws ParseException {
-		formatter.parse("23.56", Locale.US);
-	}
-
-}

org.springframework.context/src/test/java/org/springframework/format/number/NumberFormatterTests.java

@@ -23,14 +23,14 @@ import java.text.ParseException;
 import java.util.Locale;
 
 import org.junit.Test;
-import org.springframework.format.number.DecimalFormatter;
+import org.springframework.format.number.NumberFormatter;
 
 /**
  * @author Keith Donald
  */
-public class DecimalFormatterTests {
+public class NumberFormatterTests {
 
-	private DecimalFormatter formatter = new DecimalFormatter();
+	private NumberFormatter formatter = new NumberFormatter();
 
 	@Test
 	public void formatValue() {

org.springframework.context/src/test/java/org/springframework/format/number/NumberFormattingTests.java

@@ -0,0 +1,136 @@
+package org.springframework.format.number;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.Locale;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.MutablePropertyValues;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.format.annotation.NumberFormat;
+import org.springframework.format.annotation.NumberFormat.Style;
+import org.springframework.format.support.FormattingConversionService;
+import org.springframework.validation.DataBinder;
+
+public class NumberFormattingTests {
+
+	private FormattingConversionService conversionService = new FormattingConversionService();
+
+	private DataBinder binder;
+
+	@Before
+	public void setUp() {
+		conversionService.addFormatterForFieldType(Number.class, new NumberFormatter());
+		conversionService.addFormatterForFieldAnnotation(new NumberFormatAnnotationFormatterFactory());
+		LocaleContextHolder.setLocale(Locale.US);
+		binder = new DataBinder(new TestBean());
+		binder.setConversionService(conversionService);
+	}
+
+	@After
+	public void tearDown() {
+		LocaleContextHolder.setLocale(null);
+	}
+
+	@Test
+	public void testDefaultNumberFormatting() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.addPropertyValue("numberDefault", "3,339.12");
+		binder.bind(propertyValues);
+		assertEquals(0, binder.getBindingResult().getErrorCount());
+		assertEquals("3,339", binder.getBindingResult().getFieldValue("numberDefault"));		
+	}
+
+	@Test
+	public void testDefaultNumberFormattingAnnotated() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.addPropertyValue("numberDefaultAnnotated", "3,339.12");
+		binder.bind(propertyValues);
+		assertEquals(0, binder.getBindingResult().getErrorCount());
+		assertEquals("3,339.12", binder.getBindingResult().getFieldValue("numberDefaultAnnotated"));		
+	}
+
+	@Test
+	public void testCurrencyFormatting() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.addPropertyValue("currency", "$3,339.12");
+		binder.bind(propertyValues);
+		assertEquals(0, binder.getBindingResult().getErrorCount());
+		assertEquals("$3,339.12", binder.getBindingResult().getFieldValue("currency"));		
+	}
+
+	@Test
+	public void testPercentFormatting() {
+		MutablePropertyValues propertyValues = new MutablePropertyValues();
+		propertyValues.addPropertyValue("percent", "53%");
+		binder.bind(propertyValues);
+		assertEquals(0, binder.getBindingResult().getErrorCount());
+		assertEquals("53%", binder.getBindingResult().getFieldValue("percent"));
+	}
+
+	@Test
+	public void testPatternFormatting() {
+	}
+
+	public static class TestBean {
+		
+		private Integer numberDefault;
+		
+		@NumberFormat
+		private Double numberDefaultAnnotated;
+
+		@NumberFormat(style=Style.CURRENCY)
+		private BigDecimal currency;
+
+		@NumberFormat(style=Style.PERCENT)
+		private BigDecimal percent;
+
+		@NumberFormat(pattern="#,##.00")
+		private BigDecimal pattern;
+
+		public Integer getNumberDefault() {
+			return numberDefault;
+		}
+
+		public void setNumberDefault(Integer numberDefault) {
+			this.numberDefault = numberDefault;
+		}
+
+		public Double getNumberDefaultAnnotated() {
+			return numberDefaultAnnotated;
+		}
+
+		public void setNumberDefaultAnnotated(Double numberDefaultAnnotated) {
+			this.numberDefaultAnnotated = numberDefaultAnnotated;
+		}
+
+		public BigDecimal getCurrency() {
+			return currency;
+		}
+
+		public void setCurrency(BigDecimal currency) {
+			this.currency = currency;
+		}
+
+		public BigDecimal getPercent() {
+			return percent;
+		}
+
+		public void setPercent(BigDecimal percent) {
+			this.percent = percent;
+		}
+
+		public BigDecimal getPattern() {
+			return pattern;
+		}
+
+		public void setPattern(BigDecimal pattern) {
+			this.pattern = pattern;
+		}
+
+		
+	}
+}

org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java

@@ -0,0 +1,43 @@
+package org.springframework.format.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Locale;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.core.convert.ConversionService;
+
+public class FormattingConversionServiceFactoryBeanTests {
+
+	private ConversionService conversionService;
+
+	@Before
+	public void setUp() {
+		FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean();
+		factory.afterPropertiesSet();
+		this.conversionService = factory.getObject();
+		LocaleContextHolder.setLocale(Locale.US);
+	}
+
+	@After
+	public void tearDown() {
+		LocaleContextHolder.setLocale(null);
+	}
+
+	@Test
+	public void testFormatNumber() {
+		BigDecimal value = conversionService.convert("3,000.25", BigDecimal.class);
+		assertEquals("3,000.25", conversionService.convert(value, String.class));
+	}
+	
+	@Test
+	public void testFormatDate() {
+		Date value = conversionService.convert("10/29/09 12:00 PM", Date.class);
+		assertEquals("10/29/09 12:00 PM", conversionService.convert(value, String.class));		
+	}
+}

org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java

@@ -34,7 +34,7 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.format.datetime.joda.DateTimeFormatAnnotationFormatterFactory;
 import org.springframework.format.datetime.joda.DateTimeParser;
 import org.springframework.format.datetime.joda.ReadablePartialPrinter;
-import org.springframework.format.number.IntegerFormatter;
+import org.springframework.format.number.NumberFormatter;
 
 /**
  * @author Keith Donald
@@ -57,7 +57,7 @@ public class FormattingConversionServiceTests {
 
 	@Test
 	public void testFormatFieldForTypeWithFormatter() throws ParseException {
-		formattingService.addFormatterForFieldType(Number.class, new IntegerFormatter());
+		formattingService.addFormatterForFieldType(Number.class, new NumberFormatter());
 		String formatted = formattingService.convert(new Integer(3), String.class);
 		assertEquals("3", formatted);
 		Integer i = (Integer) formattingService.convert("3", Integer.class);

org.springframework.context/src/test/java/org/springframework/validation/DataBinderTests.java

@@ -44,7 +44,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.format.number.DecimalFormatter;
+import org.springframework.format.number.NumberFormatter;
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.util.StringUtils;
 
@@ -300,7 +300,7 @@ public class DataBinderTests extends TestCase {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb);
 		FormattingConversionService conversionService = new FormattingConversionService();
-		conversionService.addFormatterForFieldType(Float.class, new DecimalFormatter());
+		conversionService.addFormatterForFieldType(Float.class, new NumberFormatter());
 		binder.setConversionService(conversionService);
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.addPropertyValue("myFloat", "1,2");