diff options
Diffstat (limited to 'luni/src/test/java/libcore/java/util/OldAndroidLocaleTest.java')
-rw-r--r-- | luni/src/test/java/libcore/java/util/OldAndroidLocaleTest.java | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/luni/src/test/java/libcore/java/util/OldAndroidLocaleTest.java b/luni/src/test/java/libcore/java/util/OldAndroidLocaleTest.java index 547b70a..8fbe5ff 100644 --- a/luni/src/test/java/libcore/java/util/OldAndroidLocaleTest.java +++ b/luni/src/test/java/libcore/java/util/OldAndroidLocaleTest.java @@ -31,7 +31,6 @@ import junit.framework.TestCase; * resource bundles. */ public class OldAndroidLocaleTest extends TestCase { - // Test basic Locale infrastructure. public void testLocale() throws Exception { Locale locale = new Locale("en"); @@ -47,49 +46,6 @@ public class OldAndroidLocaleTest extends TestCase { assertEquals("en_US_POSIX", locale.toString()); } - /* - * Tests some must-have locales. TODO: Add back "de". See discussion - * immediately below this method. - */ - public void testResourceBundles() throws Exception { - Locale eng = new Locale("en", "US"); - DateFormatSymbols engSymbols = new DateFormatSymbols(eng); - - //Locale deu = new Locale("de", "DE"); - //DateFormatSymbols deuSymbols = new DateFormatSymbols(deu); - - TimeZone berlin = TimeZone.getTimeZone("Europe/Berlin"); - - assertEquals("January", engSymbols.getMonths()[0]); - //assertEquals("Januar", deuSymbols.getMonths()[0]); - - assertEquals("Sunday", engSymbols.getWeekdays()[Calendar.SUNDAY]); - //assertEquals("Sonntag", deuSymbols.getWeekdays()[Calendar.SUNDAY]); - - assertEquals("Central European Time", - berlin.getDisplayName(false, TimeZone.LONG, eng)); - assertEquals("Central European Summer Time", - berlin.getDisplayName(true, TimeZone.LONG, eng)); - - //assertEquals("Mitteleurop\u00E4ische Zeit", - // berlin.getDisplayName(false, TimeZone.LONG, deu)); - //assertEquals("Mitteleurop\u00E4ische Sommerzeit", - // berlin.getDisplayName(true, TimeZone.LONG, deu)); - - assertTrue(engSymbols.getZoneStrings().length > 100); - } - - /* - * Disabled version of the above test. The version above omits - * checks for stuff in the "de" locale, because we stripped that - * out as part of the flash reduction effort (so that we could - * still ship on Dream). We expect to have a baseline target that - * includes a large enough system partition to include "de" - * immediately after the last official release for Dream (whenever - * that may be). - * - // Test some must-have locales. - @LargeTest public void testResourceBundles() throws Exception { Locale eng = new Locale("en", "US"); DateFormatSymbols engSymbols = new DateFormatSymbols(eng); @@ -117,7 +73,6 @@ public class OldAndroidLocaleTest extends TestCase { assertTrue(engSymbols.getZoneStrings().length > 100); } - */ // This one makes sure we have all necessary locales installed. // Suppress this flaky test for now. |