From 97107a2953a5d49c17df9364d96447d0f8bb2c4c Mon Sep 17 00:00:00 2001
From: konsoletyper <konsoletyper@gmail.com>
Date: Fri, 20 Dec 2013 13:19:00 +0400
Subject: [PATCH] More tests for StringBuilder.append(D)

---
 .../java/lang/TAbstractStringBuilder.java     | 18 +++---
 .../org/teavm/classlib/java/lang/TString.java |  4 ++
 .../classlib/java/lang/StringBuilderTest.java | 63 +++++++++++++++++++
 3 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
index ee2261353..3a3056f10 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
@@ -243,7 +243,7 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
         // Extend buffer to store exponent
         if (exp != 0) {
             sz += 2;
-            if (exp < 10 || exp > 10) {
+            if (exp <= -10 || exp >= 10) {
                 ++sz;
             }
         }
@@ -276,7 +276,7 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
                 exp = -exp;
                 buffer[length++] = '-';
             }
-            if (exp > 10) {
+            if (exp >= 10) {
                 buffer[length++] = (char)('0' + exp / 10);
             }
             buffer[length++] = (char)('0' + exp % 10);
@@ -354,13 +354,13 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
             double digit = 1;
             for (int i = negDoublePowersOfTen.length - 1; i >= 0; --i) {
                 if ((exp | bit) <= DOUBLE_MAX_EXPONENT && negDoublePowersOfTen[i] * digit * 10 > value) {
-                    digit *= negPowersOfTen[i];
+                    digit *= negDoublePowersOfTen[i];
                     exp |= bit;
                 }
                 bit >>= 1;
             }
             exp = -exp;
-            mantissa = (long)(((value * DOUBLE_MAX_POS) / digit) + 0.5f);
+            mantissa = (long)(((value * DOUBLE_MAX_POS) / digit) + 0.5);
         }
 
         // Remove trailing zeros
@@ -387,10 +387,10 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
         // Extend buffer to store exponent
         if (exp != 0) {
             sz += 2;
-            if (exp < 10 || exp > 10) {
+            if (exp <= -10 || exp >= 10) {
                 ++sz;
             }
-            if (exp < 100 || exp > 100) {
+            if (exp <= -100 || exp >= 100) {
                 ++sz;
             }
         }
@@ -423,11 +423,11 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
                 exp = -exp;
                 buffer[length++] = '-';
             }
-            if (exp > 100) {
+            if (exp >= 100) {
                 buffer[length++] = (char)('0' + exp / 100);
                 exp %= 100;
-            }
-            if (exp > 10) {
+                buffer[length++] = (char)('0' + exp / 10);
+            } else if (exp >= 10) {
                 buffer[length++] = (char)('0' + exp / 10);
             }
             buffer[length++] = (char)('0' + exp % 10);
diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TString.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TString.java
index 65cd9fd89..d394b2b6a 100644
--- a/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TString.java
+++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/lang/TString.java
@@ -425,6 +425,10 @@ public class TString extends TObject implements TSerializable, TComparable<TStri
         return new TStringBuilder().append(f).toString0();
     }
 
+    public static TString valueOf(double d) {
+        return new TStringBuilder().append(d).toString0();
+    }
+
     @Override
     public boolean equals(TObject other) {
         if (this == other) {
diff --git a/teavm-classlib/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java b/teavm-classlib/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java
index 121083f4b..5526223c2 100644
--- a/teavm-classlib/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java
+++ b/teavm-classlib/src/test/java/org/teavm/classlib/java/lang/StringBuilderTest.java
@@ -212,6 +212,69 @@ public class StringBuilderTest {
         assertEquals("1.23456789E150", sb.toString());
     }
 
+    @Test
+    public void negativeDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(-1.23456789E150);
+        assertEquals("-1.23456789E150", sb.toString());
+    }
+
+    @Test
+    public void smallDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(1.23456789E-150);
+        assertEquals("1.23456789E-150", sb.toString());
+    }
+
+    @Test
+    public void maxDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(1.79769313486231E308);
+        assertEquals("1.79769313486231E308", sb.toString());
+    }
+
+    @Test
+    public void minDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(2.2250738585072E-308);
+        assertEquals("2.2250738585072E-308", sb.toString());
+    }
+
+    @Test
+    public void zeroDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(0);
+        assertEquals("0", sb.toString());
+    }
+
+    @Test
+    public void doubleInfinityAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(Double.POSITIVE_INFINITY);
+        assertEquals("Infinity", sb.toString());
+    }
+
+    @Test
+    public void doubleNaNAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(Double.NaN);
+        assertEquals("NaN", sb.toString());
+    }
+
+    @Test
+    public void normalDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(1200.0);
+        assertEquals("1200.0", sb.toString());
+    }
+
+    @Test
+    public void normalSmallDoubleAppended() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(0.023);
+        assertEquals("0.023", sb.toString());
+    }
+
     @Test
     public void appendsCodePoint() {
         StringBuilder sb = new StringBuilder();