eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-23 23:04:50 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add tests for rounding behavour

Browse Source
This commit is contained in:
Alexey Andreev 2015-06-04 19:45:28 +04:00
parent bd285b8df5
commit a66faba99c
2 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java
View File

@ -26,8 +26,8 @@ import org.teavm.classlib.java.util.TLocale;
* @author Alexey Andreev * @author Alexey Andreev
*/ */
public class TDecimalFormat extends TNumberFormat { public class TDecimalFormat extends TNumberFormat {
private static final long MANTISSA_PATTERN = 100_0000_0000_0000_0000L; private static final long MANTISSA_PATTERN = 10_0000_0000_0000_0000L;
private static final int MANTISSA_LENGTH = 18; private static final int MANTISSA_LENGTH = 17;
private static final long[] POW10_ARRAY = { 1, 10, 100, 1000, 1_0000, 1_0_0000, 1_00_0000, private static final long[] POW10_ARRAY = { 1, 10, 100, 1000, 1_0000, 1_0_0000, 1_00_0000,
1_000_0000, 1_0000_0000, 1_0_0000_0000, 1_00_0000_0000L, 1_000_0000_0000L, 1_0000_0000_0000L, 1_000_0000, 1_0000_0000, 1_0_0000_0000, 1_00_0000_0000L, 1_000_0000_0000L, 1_0000_0000_0000L,
1_0_0000_0000_0000L, 1_00_0000_0000_0000L, 1_000_0000_0000_0000L, 1_0000_0000_0000_0000L, 1_0_0000_0000_0000L, 1_00_0000_0000_0000L, 1_000_0000_0000_0000L, 1_0000_0000_0000_0000L,
@ -421,7 +421,7 @@ public class TDecimalFormat extends TNumberFormat {
positive = true; positive = true;
} else { } else {
positive = false; positive = false;
mantissa = -mantissa; value = -value;
} }
if (value >= 1) { if (value >= 1) {
int bit = 256; int bit = 256;

67
teavm-tests/src/test/java/org/teavm/classlib/java/text/DecimalFormatTest.java
View File

@ -1,6 +1,7 @@
package org.teavm.classlib.java.text; package org.teavm.classlib.java.text;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.math.RoundingMode;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.util.Locale; import java.util.Locale;
@ -134,6 +135,72 @@ public class DecimalFormatTest {
assertEquals("0.00000000000000000000000023", format.format(23E-26)); assertEquals("0.00000000000000000000000023", format.format(23E-26));
} }
@Test
public void formatsFractionalPart() {
DecimalFormat format = createFormat("0.0000####");
assertEquals("0.00001235", format.format(0.0000123456));
assertEquals("0.00012346", format.format(0.000123456));
assertEquals("0.00123456", format.format(0.00123456));
assertEquals("0.0123456", format.format(0.0123456));
assertEquals("0.1200", format.format(0.12));
assertEquals("0.1230", format.format(0.123));
assertEquals("0.1234", format.format(0.1234));
assertEquals("0.12345", format.format(0.12345));
}
@Test
public void roundingWorks() {
DecimalFormat format = createFormat("0");
format.setRoundingMode(RoundingMode.UP);
assertEquals("3", format.format(2.3));
assertEquals("3", format.format(2.7));
assertEquals("-3", format.format(-2.3));
assertEquals("-3", format.format(-2.7));
format.setRoundingMode(RoundingMode.DOWN);
assertEquals("2", format.format(2.3));
assertEquals("2", format.format(2.7));
assertEquals("-2", format.format(-2.3));
assertEquals("-2", format.format(-2.7));
format.setRoundingMode(RoundingMode.FLOOR);
assertEquals("2", format.format(2.3));
assertEquals("2", format.format(2.7));
assertEquals("-3", format.format(-2.3));
assertEquals("-3", format.format(-2.7));
format.setRoundingMode(RoundingMode.CEILING);
assertEquals("3", format.format(2.3));
assertEquals("3", format.format(2.7));
assertEquals("-2", format.format(-2.3));
assertEquals("-2", format.format(-2.7));
format.setRoundingMode(RoundingMode.HALF_DOWN);
assertEquals("2", format.format(2.3));
assertEquals("3", format.format(2.7));
assertEquals("2", format.format(2.5));
assertEquals("3", format.format(3.5));
assertEquals("-2", format.format(-2.5));
assertEquals("-3", format.format(-3.5));
format.setRoundingMode(RoundingMode.HALF_UP);
assertEquals("2", format.format(2.3));
assertEquals("3", format.format(2.7));
assertEquals("3", format.format(2.5));
assertEquals("4", format.format(3.5));
assertEquals("-3", format.format(-2.5));
assertEquals("-4", format.format(-3.5));
format.setRoundingMode(RoundingMode.HALF_EVEN);
assertEquals("2", format.format(2.3));
assertEquals("3", format.format(2.7));
assertEquals("2", format.format(2.5));
assertEquals("4", format.format(3.5));
assertEquals("-2", format.format(-2.5));
assertEquals("-4", format.format(-3.5));
}
private DecimalFormat createFormat(String format) { private DecimalFormat createFormat(String format) {
return new DecimalFormat(format, symbols); return new DecimalFormat(format, symbols);