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

View File

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

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

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

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

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