eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing folder to CLDR archive. Fix tests WRT changes in CLDR.

Browse Source
This commit is contained in:
Alexey Andreev 2017-06-25 13:36:35 +03:00
parent 54dee03a83
commit d982f89ab6
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java
View File

@ -152,8 +152,10 @@ public abstract class TTimeZone implements Serializable, Cloneable {
*/ */
public static TTimeZone getDefault() { public static TTimeZone getDefault() {
if (defaultTz == null) { if (defaultTz == null) {
defaultTz = new TIANATimeZone(DateTimeZoneProvider.detectTimezone()); DateTimeZone innerTz = DateTimeZoneProvider.detectTimezone();
if (defaultTz == null) { if (innerTz != null) {
defaultTz = new TIANATimeZone(innerTz);
} else {
defaultTz = TTimeZone.getTimeZone("UTC"); defaultTz = TTimeZone.getTimeZone("UTC");
} }
} }

BIN
classlib/src/main/resources/org/teavm/classlib/impl/unicode/cldr-json.zip
View File

Binary file not shown.

3
tests/src/test/java/org/teavm/classlib/java/text/NumberFormatTest.java
View File

@ -24,6 +24,7 @@ public class NumberFormatTest {
} }
@Test @Test
@SkipJVM
public void formatsCurrency() { public void formatsCurrency() {
NumberFormat format = NumberFormat.getCurrencyInstance(new Locale("en", "US")); NumberFormat format = NumberFormat.getCurrencyInstance(new Locale("en", "US"));
format.setCurrency(Currency.getInstance("RUB")); format.setCurrency(Currency.getInstance("RUB"));
@ -31,7 +32,7 @@ public class NumberFormatTest {
format = NumberFormat.getCurrencyInstance(new Locale("ru", "RU")); format = NumberFormat.getCurrencyInstance(new Locale("ru", "RU"));
format.setCurrency(Currency.getInstance("RUB")); format.setCurrency(Currency.getInstance("RUB"));
assertEquals("123 456,79 руб.", format.format(123456.789123).replace('\u00A0', ' ')); assertEquals("123 456,79 \u20BD", format.format(123456.789123).replace('\u00A0', ' '));
} }
@Test @Test

16
tests/src/test/java/org/teavm/classlib/java/text/SimpleDateFormatTest.java
View File

@ -21,6 +21,7 @@ import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.teavm.junit.SkipJVM;
import org.teavm.junit.TeaVMTestRunner; import org.teavm.junit.TeaVMTestRunner;
@RunWith(TeaVMTestRunner.class) @RunWith(TeaVMTestRunner.class)
@ -30,8 +31,9 @@ public class SimpleDateFormatTest {
} }
@Test @Test
@SkipJVM
public void firstDayOfWeekMatches() { public void firstDayOfWeekMatches() {
assertEquals(Calendar.SUNDAY, new GregorianCalendar(Locale.ENGLISH).getFirstDayOfWeek()); assertEquals(Calendar.MONDAY, new GregorianCalendar(Locale.ENGLISH).getFirstDayOfWeek());
assertEquals(1, new GregorianCalendar(Locale.ENGLISH).getMinimalDaysInFirstWeek()); assertEquals(1, new GregorianCalendar(Locale.ENGLISH).getMinimalDaysInFirstWeek());
} }
@ -62,22 +64,26 @@ public class SimpleDateFormatTest {
} }
@Test @Test
@SkipJVM
public void weekInYearHandled() throws ParseException { public void weekInYearHandled() throws ParseException {
long day = 24 * 3600 * 1000; long day = 24 * 3600 * 1000;
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss www", Locale.ENGLISH); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss www", Locale.ENGLISH);
assertEquals("2014-06-24 09:33:49 026", format.format(getDateWithZoneOffset(1403602429504L))); assertEquals("2014-06-24 09:33:49 026", format.format(getDateWithZoneOffset(1403602429504L)));
assertEquals("2014-06-28 09:33:49 026", format.format(getDateWithZoneOffset(1403602429504L + day * 4))); assertEquals("2014-06-28 09:33:49 026", format.format(getDateWithZoneOffset(1403602429504L + day * 4)));
assertEquals("2014-06-29 09:33:49 027", format.format(getDateWithZoneOffset(1403602429504L + day * 5))); assertEquals("2014-06-29 09:33:49 026", format.format(getDateWithZoneOffset(1403602429504L + day * 5)));
assertEquals("2014-06-30 09:33:49 027", format.format(getDateWithZoneOffset(1403602429504L + day * 6)));
assertEquals(1403602429000L, getTimeWithoutZoneOffset(format.parse("2014-06-24 09:33:49 026"))); assertEquals(1403602429000L, getTimeWithoutZoneOffset(format.parse("2014-06-24 09:33:49 026")));
assertEquals(1403602429000L + day * 4, getTimeWithoutZoneOffset(format.parse("2014-06-28 09:33:49 026"))); assertEquals(1403602429000L + day * 4, getTimeWithoutZoneOffset(format.parse("2014-06-28 09:33:49 026")));
assertEquals(1403602429000L + day * 5, getTimeWithoutZoneOffset(format.parse("2014-06-29 09:33:49 027"))); assertEquals(1403602429000L + day * 5, getTimeWithoutZoneOffset(format.parse("2014-06-29 09:33:49 026")));
assertEquals(1403602429000L + day * 6, getTimeWithoutZoneOffset(format.parse("2014-06-30 09:33:49 027")));
} }
@Test @Test
@SkipJVM
public void weekInMonthHandled() throws ParseException { public void weekInMonthHandled() throws ParseException {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss WW", Locale.ENGLISH); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss WW", Locale.ENGLISH);
assertEquals("2014-06-24 09:33:49 04", format.format(getDateWithZoneOffset(1403602429504L))); assertEquals("2014-06-24 09:33:49 05", format.format(getDateWithZoneOffset(1403602429504L)));
assertEquals(1403602429000L, getTimeWithoutZoneOffset(format.parse("2014-06-24 09:33:49 04"))); assertEquals(1403602429000L, getTimeWithoutZoneOffset(format.parse("2014-06-24 09:33:49 05")));
} }
@Test @Test

2
tests/src/test/java/org/teavm/classlib/java/util/CurrencyTest.java
View File

@ -78,7 +78,7 @@ public class CurrencyTest {
currency = Currency.getInstance("RUB"); currency = Currency.getInstance("RUB");
assertEquals("RUB", currency.getSymbol(english)); assertEquals("RUB", currency.getSymbol(english));
assertEquals("руб.", currency.getSymbol(russian)); assertEquals("\u20BD", currency.getSymbol(russian));
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)