Changeset 5776

Timestamp:

Sep 30, 2011, 1:28:05 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1633: NumberFormatException? when parsing NaN values

Location:

trunk/src

Files:

• core/net/sf/basedb/core/Type.java (modified) (1 diff)
• test/TestNumberFormat.java (modified) (5 diffs)

trunk/src/core/net/sf/basedb/core/Type.java

@@ -520 +520 @@
     {
       value = value.trim();
+      if ("NaN".equalsIgnoreCase(value)) return parseString("NaN");
       if (value.indexOf('e') > 0) value = value.replace('e', 'E');
       if (value.indexOf("E+") > 0) value = value.replace("E+", "E");

trunk/src/test/TestNumberFormat.java

@@ -21 +21 @@
 */
 import net.sf.basedb.core.Type;
+import net.sf.basedb.util.EqualsHelper;
 import net.sf.basedb.util.NumberFormatUtil;
 
@@ -76 +77 @@
     
     // Invalid decimal separator
-    test_parse_number(dotFormat, "123,456", Float.NaN, SHOULD_FAIL);
+    test_parse_number(dotFormat, "123,456", null, SHOULD_FAIL);
     
     java.text.NumberFormat decFormat = NumberFormatUtil.getNumberFormat(',', ';');
@@ -82 +83 @@
     test_parse_number(decFormat, "1,23456E2", resultPositive, SHOULD_PASS);
     test_parse_number(decFormat, "1234,56e-1", resultPositive, SHOULD_PASS);
-    test_parse_number(decFormat, "123.456", Float.NaN, SHOULD_FAIL);
+    test_parse_number(decFormat, "123.456", null, SHOULD_FAIL);
 
+    // Special values
+    test_parse_number(dotFormat, "NaN", null, SHOULD_PASS);
+    
     write("++Testing Number parser "+(ok ? "OK" : "Failed")+"\n");
     return ok;
@@ -93 +97 @@
   }
   
-  static void test_parse_number(java.text.NumberFormat format, String value, float expectedResult, boolean shouldFail)
+  static void test_parse_number(java.text.NumberFormat format, String value, Float expectedResult, boolean shouldFail)
   {
     try
@@ -102 +106 @@
         throw new Exception("Parsing '" + value + "' should fail; got: " + fValue + "f");
       }
-      if (fValue != expectedResult)
+      if (!EqualsHelper.equals(expectedResult, fValue))
       {
         throw new Exception("Parsing '" + value + "' --> " + fValue + "f <> " + expectedResult + " (expected)");