root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed format tests

This commit is contained in:
Juergen Hoeller 2009-09-08 00:15:09 +00:00
parent 0d084bd7f8
commit 70038bcf3c
5 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyFormatter.java
View File

@ -77,11 +77,13 @@ public final class CurrencyFormatter extends AbstractNumberFormatter {
public BigDecimal parse(String formatted, Locale locale) throws ParseException {
BigDecimal decimal = (BigDecimal) super.parse(formatted, locale);
if (this.roundingMode != null) {
decimal = decimal.setScale(this.fractionDigits, this.roundingMode);
}
else {
decimal = decimal.setScale(this.fractionDigits);
if (decimal != null) {
if (this.roundingMode != null) {
decimal = decimal.setScale(this.fractionDigits, this.roundingMode);
}
else {
decimal = decimal.setScale(this.fractionDigits);
}
}
return decimal;
}

25
org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java
View File

@ -1,14 +1,32 @@
/*
* 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.ui.format.number;
import static org.junit.Assert.assertEquals;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.util.Locale;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.ui.format.number.CurrencyFormatter;
/**
* @author Keith Donald
*/
public class CurrencyFormatterTests {
private CurrencyFormatter formatter = new CurrencyFormatter();
@ -35,6 +53,7 @@ public class CurrencyFormatterTests {
@Test
public void parseValueDefaultRoundDown() throws ParseException {
this.formatter.setRoundingMode(RoundingMode.DOWN);
assertEquals(new BigDecimal("23.56"), formatter.parse("$23.567", Locale.US));
}

19
org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java
View File

@ -1,3 +1,19 @@
/*
* 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.ui.format.number;
import static org.junit.Assert.assertEquals;
@ -9,6 +25,9 @@ import java.util.Locale;
import org.junit.Test;
import org.springframework.ui.format.number.DecimalFormatter;
/**
* @author Keith Donald
*/
public class DecimalFormatterTests {
private DecimalFormatter formatter = new DecimalFormatter();

19
org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java
View File

@ -1,3 +1,19 @@
/*
* 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.ui.format.number;
import static org.junit.Assert.assertEquals;
@ -8,6 +24,9 @@ import java.util.Locale;
import org.junit.Test;
import org.springframework.ui.format.number.IntegerFormatter;
/**
* @author Keith Donald
*/
public class IntegerFormatterTests {
private IntegerFormatter formatter = new IntegerFormatter();

19
org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java
View File

@ -1,3 +1,19 @@
/*
* 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.ui.format.number;
import static org.junit.Assert.assertEquals;
@ -9,6 +25,9 @@ import java.util.Locale;
import org.junit.Test;
import org.springframework.ui.format.number.PercentFormatter;
/**
* @author Keith Donald
*/
public class PercentFormatterTests {
private PercentFormatter formatter = new PercentFormatter();