Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 11:35:29 -04:00
Code Issues Projects Releases Wiki Activity

Fixed test case + code clean-up.

Browse Source
This commit is contained in:
Harald Kuhr 2011-11-01 14:09:34 +01:00
parent 8dcfb46bdb
commit 17f3b97699
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java
View File

@ -91,7 +91,6 @@ public class NumberConverter implements PropertyConverter {
if (pFormat == null) { if (pFormat == null) {
// Use system default format, using default locale // Use system default format, using default locale
// format = NumberFormat.getNumberInstance();
format = sDefaultFormat; format = sDefaultFormat;
} }
else { else {
@ -160,7 +159,6 @@ public class NumberConverter implements PropertyConverter {
try { try {
// Convert to string, default way // Convert to string, default way
if (StringUtil.isEmpty(pFormat)) { if (StringUtil.isEmpty(pFormat)) {
// return NumberFormat.getNumberInstance().format(pObject);
return sDefaultFormat.format(pObject); return sDefaultFormat.format(pObject);
} }
@ -196,13 +194,11 @@ public class NumberConverter implements PropertyConverter {
return null; return null;
} }
// ...and store in cache // ...and store in cache
sFormats.put(key, format); sFormats.put(key, format);
} }
return format; return format;
} }
} }
} }

9
common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java
View File

@ -3,10 +3,9 @@ package com.twelvemonkeys.lang;
import junit.framework.TestCase; import junit.framework.TestCase;
import java.io.Serializable; import java.io.Serializable;
import java.util.Map;
import java.util.HashMap;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.text.NumberFormat; import java.util.HashMap;
import java.util.Map;
/** /**
* BeanUtilTestCase * BeanUtilTestCase
@ -95,7 +94,7 @@ public class BeanUtilTestCase extends TestCase {
map.put("stringValue", 1); map.put("stringValue", 1);
map.put("intValue", "2"); map.put("intValue", "2");
map.put("doubleValue", NumberFormat.getNumberInstance().format(0.3)); // Note, format is locale specific... map.put("doubleValue", ".3");
try { try {
BeanUtil.configure(bean, map); BeanUtil.configure(bean, map);
@ -106,7 +105,7 @@ public class BeanUtilTestCase extends TestCase {
assertEquals("1", bean.getStringValue()); assertEquals("1", bean.getStringValue());
assertEquals(2, bean.getIntValue()); assertEquals(2, bean.getIntValue());
assertEquals(.3, bean.getDoubleValue()); assertEquals(0.3, bean.getDoubleValue());
} }
public void testConfigureAmbigious1() { public void testConfigureAmbigious1() {