Minor float/double parsing improvements.

This removes some duplication and fixes an actual bug: we'd accept strings
like ".NaN" or "Infinity." because the length check was done incorrectly.

Also add explicit unit tests for some Double.toString duplicate bug reports,
since that ought to be SOP.

(I'm here to fix an unrelated bug, but want to keep this cleanup separate.)

Change-Id: I197613afe52fae8da7a1598bb6b43514dcc03b98

2 files changed, 68 insertions, 2 deletions

diff --git a/luni/src/test/java/libcore/java/lang/DoubleTest.java b/luni/src/test/java/libcore/java/lang/DoubleTest.java
index f92ae33..988174b 100644
--- a/luni/src/test/java/libcore/java/lang/DoubleTest.java
+++ b/luni/src/test/java/libcore/java/lang/DoubleTest.java
@@ -19,9 +19,44 @@ package libcore.java.lang;
 import junit.framework.TestCase;
 
 public class DoubleTest extends TestCase {
-    // http://b/3238333
-    public void test3238333() throws Exception {
+    public void testDoubleToStringUnsignedDivide() throws Exception {
+        // http://b/3238333
         assertEquals("0.008", Double.toString(0.008));
         assertEquals("0.008366", Double.toString(0.008366));
+        // http://code.google.com/p/android/issues/detail?id=14033
+        assertEquals("0.009", Double.toString(0.009));
+        // http://code.google.com/p/android/issues/detail?id=14302
+        assertEquals("0.008567856012638986", Double.toString(0.008567856012638986));
+        assertEquals("0.010206713752229896", Double.toString(0.010206713752229896));
+    }
+
+    public void testNamedDoubles() throws Exception {
+        assertEquals(Double.NaN, Double.parseDouble("NaN"));
+        assertEquals(Double.NaN, Double.parseDouble("-NaN"));
+        assertEquals(Double.NaN, Double.parseDouble("+NaN"));
+        try {
+            Double.parseDouble("NNaN");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+        try {
+            Double.parseDouble("NaNN");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+
+        assertEquals(Double.POSITIVE_INFINITY, Double.parseDouble("+Infinity"));
+        assertEquals(Double.POSITIVE_INFINITY, Double.parseDouble("Infinity"));
+        assertEquals(Double.NEGATIVE_INFINITY, Double.parseDouble("-Infinity"));
+        try {
+            Double.parseDouble("IInfinity");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+        try {
+            Double.parseDouble("Infinityy");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
     }
 }
diff --git a/luni/src/test/java/libcore/java/lang/FloatTest.java b/luni/src/test/java/libcore/java/lang/FloatTest.java
index 3708d87..de20ce7 100644
--- a/luni/src/test/java/libcore/java/lang/FloatTest.java
+++ b/luni/src/test/java/libcore/java/lang/FloatTest.java
@@ -22,9 +22,40 @@ public class FloatTest extends junit.framework.TestCase {
         // http://code.google.com/p/android/issues/detail?id=4185
         assertEquals(2358.166016f, Float.valueOf("2358.166016"));
     }
+
     public void test_valueOf_String2() throws Exception {
         // This threw OutOfMemoryException.
         // http://code.google.com/p/android/issues/detail?id=3156
         assertEquals(-2.14748365E9f, Float.valueOf(String.valueOf(Integer.MIN_VALUE)));
     }
+
+    public void testNamedFloats() throws Exception {
+        assertEquals(Float.NaN, Float.parseFloat("NaN"));
+        assertEquals(Float.NaN, Float.parseFloat("-NaN"));
+        assertEquals(Float.NaN, Float.parseFloat("+NaN"));
+        try {
+            Float.parseFloat("NNaN");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+        try {
+            Float.parseFloat("NaNN");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+
+        assertEquals(Float.POSITIVE_INFINITY, Float.parseFloat("+Infinity"));
+        assertEquals(Float.POSITIVE_INFINITY, Float.parseFloat("Infinity"));
+        assertEquals(Float.NEGATIVE_INFINITY, Float.parseFloat("-Infinity"));
+        try {
+            Float.parseFloat("IInfinity");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+        try {
+            Float.parseFloat("Infinityy");
+            fail();
+        } catch (NumberFormatException expected) {
+        }
+    }
 }