diff options
10 files changed, 158 insertions, 274 deletions
diff --git a/luni/src/test/java/libcore/java/text/DecimalFormatTest.java b/luni/src/test/java/libcore/java/text/DecimalFormatTest.java index 9de1f0a..dbcb1c8 100644 --- a/luni/src/test/java/libcore/java/text/DecimalFormatTest.java +++ b/luni/src/test/java/libcore/java/text/DecimalFormatTest.java @@ -24,7 +24,6 @@ import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Currency; import java.util.Locale; -import tests.support.Support_Locale; public class DecimalFormatTest extends junit.framework.TestCase { public void test_exponentSeparator() throws Exception { @@ -81,11 +80,9 @@ public class DecimalFormatTest extends junit.framework.TestCase { assertDecFmtWithMultiplierAndFractionByLocale("3330000000000000000000000000000000", 3, 4, Locale.US, "9,990,000,000,000,000,000,000,000,000,000,000"); - Locale inLocale = new Locale("en", "IN"); - if (Support_Locale.isLocaleAvailable(inLocale)) { - assertDecFmtWithMultiplierAndFractionByLocale("3330000000000000000000000000000000", 3, 4, - inLocale, "9,99,00,00,00,00,00,00,00,00,00,00,00,00,00,00,000"); - } + Locale en_IN = new Locale("en", "IN"); + assertDecFmtWithMultiplierAndFractionByLocale("3330000000000000000000000000000000", 3, 4, + en_IN, "9,99,00,00,00,00,00,00,00,00,00,00,00,00,00,00,000"); } public void testBigDecimalTestBigIntWithMultiplier() { @@ -104,22 +101,20 @@ public class DecimalFormatTest extends junit.framework.TestCase { assertDecFmtWithMultiplierAndFractionByLocale("98765432109876543210987654321", -10, 0, Locale.US, "-987,654,321,098,765,432,109,876,543,210"); - Locale inLocale = new Locale("en", "IN"); - if (Support_Locale.isLocaleAvailable(inLocale)) { - assertDecFmtWithMultiplierAndFractionByLocale("123456789012345", 10, 0, - inLocale, "1,23,45,67,89,01,23,450"); - assertDecFmtWithMultiplierAndFractionByLocale("12345678901234567890", 10, 0, - inLocale, "12,34,56,78,90,12,34,56,78,900"); - assertDecFmtWithMultiplierAndFractionByLocale("98765432109876543210987654321", 10, 0, - inLocale, "9,87,65,43,21,09,87,65,43,21,09,87,65,43,210"); - - assertDecFmtWithMultiplierAndFractionByLocale("123456789012345", -10, 0, - inLocale, "-1,23,45,67,89,01,23,450"); - assertDecFmtWithMultiplierAndFractionByLocale("12345678901234567890", -10, 0, - inLocale, "-12,34,56,78,90,12,34,56,78,900"); - assertDecFmtWithMultiplierAndFractionByLocale("98765432109876543210987654321", -10, 0, - inLocale, "-9,87,65,43,21,09,87,65,43,21,09,87,65,43,210"); - } + Locale en_IN = new Locale("en", "IN"); + assertDecFmtWithMultiplierAndFractionByLocale("123456789012345", 10, 0, + en_IN, "1,23,45,67,89,01,23,450"); + assertDecFmtWithMultiplierAndFractionByLocale("12345678901234567890", 10, 0, + en_IN, "12,34,56,78,90,12,34,56,78,900"); + assertDecFmtWithMultiplierAndFractionByLocale("98765432109876543210987654321", 10, 0, + en_IN, "9,87,65,43,21,09,87,65,43,21,09,87,65,43,210"); + + assertDecFmtWithMultiplierAndFractionByLocale("123456789012345", -10, 0, + en_IN, "-1,23,45,67,89,01,23,450"); + assertDecFmtWithMultiplierAndFractionByLocale("12345678901234567890", -10, 0, + en_IN, "-12,34,56,78,90,12,34,56,78,900"); + assertDecFmtWithMultiplierAndFractionByLocale("98765432109876543210987654321", -10, 0, + en_IN, "-9,87,65,43,21,09,87,65,43,21,09,87,65,43,210"); } public void testBigDecimalICUConsistency() { diff --git a/luni/src/test/java/libcore/java/text/NumberFormatTest.java b/luni/src/test/java/libcore/java/text/NumberFormatTest.java index ce80bd1..1a14462 100644 --- a/luni/src/test/java/libcore/java/text/NumberFormatTest.java +++ b/luni/src/test/java/libcore/java/text/NumberFormatTest.java @@ -23,7 +23,6 @@ import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import tests.support.Support_Locale; public class NumberFormatTest extends junit.framework.TestCase { // NumberFormat.format(Object, StringBuffer, FieldPosition) guarantees it calls doubleValue for @@ -66,9 +65,6 @@ public class NumberFormatTest extends junit.framework.TestCase { } public void test_getIntegerInstance_ar() throws Exception { - if (!Support_Locale.isLocaleAvailable(new Locale("ar"))) { - return; - } NumberFormat numberFormat = NumberFormat.getNumberInstance(new Locale("ar")); assertEquals("#0.###;#0.###-", ((DecimalFormat) numberFormat).toPattern()); NumberFormat integerFormat = NumberFormat.getIntegerInstance(new Locale("ar")); @@ -77,9 +73,6 @@ public class NumberFormatTest extends junit.framework.TestCase { public void test_numberLocalization() throws Exception { Locale arabic = new Locale("ar"); - if (!Support_Locale.isLocaleAvailable(arabic)) { - return; - } NumberFormat nf = NumberFormat.getNumberInstance(arabic); assertEquals('\u0660', new DecimalFormatSymbols(arabic).getZeroDigit()); assertEquals("١٢٣٤٥٦٧٨٩٠", nf.format(1234567890)); diff --git a/luni/src/test/java/libcore/java/text/OldNumberFormatTest.java b/luni/src/test/java/libcore/java/text/OldNumberFormatTest.java index 7bb5545..b7ae098 100644 --- a/luni/src/test/java/libcore/java/text/OldNumberFormatTest.java +++ b/luni/src/test/java/libcore/java/text/OldNumberFormatTest.java @@ -26,7 +26,6 @@ import java.text.ParsePosition; import java.util.Currency; import java.util.Locale; import junit.framework.TestCase; -import tests.support.Support_Locale; public class OldNumberFormatTest extends TestCase { @@ -41,25 +40,22 @@ public class OldNumberFormatTest extends TestCase { // try with a locale that has a different integer pattern Locale chLocale = new Locale("de", "CH"); - if (Support_Locale.isLocaleAvailable(chLocale)) { - format = (DecimalFormat) NumberFormat.getIntegerInstance(chLocale); - assertEquals("#,##0", format.toPattern()); - assertEquals("-36", format.format(-35.76)); - assertEquals(new Long(-36), format.parse("-36")); - assertEquals(new Long(-36), format.parseObject("-36")); - assertEquals(0, format.getMaximumFractionDigits()); - assertTrue(format.isParseIntegerOnly()); - } + format = (DecimalFormat) NumberFormat.getIntegerInstance(chLocale); + assertEquals("#,##0", format.toPattern()); + assertEquals("-36", format.format(-35.76)); + assertEquals(new Long(-36), format.parse("-36")); + assertEquals(new Long(-36), format.parseObject("-36")); + assertEquals(0, format.getMaximumFractionDigits()); + assertTrue(format.isParseIntegerOnly()); + Locale arLocale = new Locale("ar", "AE"); - if (Support_Locale.isLocaleAvailable(arLocale)) { - format = (DecimalFormat) NumberFormat.getIntegerInstance(arLocale); - assertEquals("#0;#0-", format.toPattern()); - assertEquals("\u0666-", format.format(-6)); - assertEquals(new Long(-36), format.parse("36-")); - assertEquals(new Long(-36), format.parseObject("36-")); - assertEquals(0, format.getMaximumFractionDigits()); - assertTrue(format.isParseIntegerOnly()); - } + format = (DecimalFormat) NumberFormat.getIntegerInstance(arLocale); + assertEquals("#0;#0-", format.toPattern()); + assertEquals("\u0666-", format.format(-6)); + assertEquals(new Long(-36), format.parse("36-")); + assertEquals(new Long(-36), format.parseObject("36-")); + assertEquals(0, format.getMaximumFractionDigits()); + assertTrue(format.isParseIntegerOnly()); } public void test_setMaximumIntegerDigits() { @@ -114,15 +110,11 @@ public class OldNumberFormatTest extends TestCase { parseObjectTest(NumberFormat.getInstance(), "123.123abc123", new ParsePosition(3), new Double(0.123), 7, true); - if (Support_Locale.isLocaleAvailable(Locale.FRANCE)) { - parseObjectTest(NumberFormat.getInstance(Locale.FRANCE), - "asd123,123abc123", - new ParsePosition(3), new Double(123.123), 10, true); + parseObjectTest(NumberFormat.getInstance(Locale.FRANCE), "asd123,123abc123", + new ParsePosition(3), new Double(123.123), 10, true); - parseObjectTest(NumberFormat.getInstance(Locale.FRANCE), - "test test", - new ParsePosition(0), null, 0, false); - } + parseObjectTest(NumberFormat.getInstance(Locale.FRANCE), "test test", + new ParsePosition(0), null, 0, false); parseObjectTest(NumberFormat.getIntegerInstance(), "asd123.123abc123", @@ -222,14 +214,12 @@ public class OldNumberFormatTest extends TestCase { out.toString()); Locale deLocale = new Locale("de", "CH"); - if (Support_Locale.isLocaleAvailable(deLocale)) { - NumberFormat nf2 = NumberFormat.getInstance(deLocale); - out = nf2.format(-1234567890.0123456789); - // use de_CH instead - // assertEquals("Wrong result for double : " + out, "1,234,567,890.012-", - // out.toString()); - assertEquals("Wrong result for double : " + out, "-1'234'567'890.012", out.toString()); - } + NumberFormat nf2 = NumberFormat.getInstance(deLocale); + out = nf2.format(-1234567890.0123456789); + // use de_CH instead + // assertEquals("Wrong result for double : " + out, "1,234,567,890.012-", + // out.toString()); + assertEquals("Wrong result for double : " + out, "-1'234'567'890.012", out.toString()); out = nf1.format(1.0001); assertEquals("Wrong result for for double: " + out, "1", out.toString()); @@ -251,14 +241,12 @@ public class OldNumberFormatTest extends TestCase { "-9,223,372,036,854,775,808", out.toString()); Locale deLocale = new Locale("de", "CH"); - if (Support_Locale.isLocaleAvailable(deLocale)) { - NumberFormat nf2 = NumberFormat.getInstance(deLocale); - out = nf2.format(-1234567890); - // use de_CH instead - // assertEquals("Wrong result for double : " + out, "-1 234 567 890", out - // .toString()); - assertEquals("Wrong result for double : " + out, "-1'234'567'890", out.toString()); - } + NumberFormat nf2 = NumberFormat.getInstance(deLocale); + out = nf2.format(-1234567890); + // use de_CH instead + // assertEquals("Wrong result for double : " + out, "-1 234 567 890", out + // .toString()); + assertEquals("Wrong result for double : " + out, "-1'234'567'890", out.toString()); // the Locale data of icu uses \uc2a0 out = nf1.format(1); @@ -322,18 +310,16 @@ public class OldNumberFormatTest extends TestCase { assertEquals("$1.00", format.format(0.999)); Locale atLocale = new Locale("de", "AT"); - if (Support_Locale.isLocaleAvailable(atLocale)) { - format = NumberFormat.getCurrencyInstance(atLocale); - // BEGIN android-changed: ICU uses non-breaking space after the euro sign; the RI uses ' '. - assertEquals("\u20ac\u00a035,76", format.format(35.76)); - assertEquals("\u20ac\u00a0123.456,79", format.format(123456.789)); - assertEquals("\u20ac\u00a00,10", format.format(0.1)); - assertEquals("\u20ac\u00a01,00", format.format(0.999)); - try { - NumberFormat.getCurrencyInstance(null); - fail("java.lang.NullPointerException is not thrown"); - } catch (java.lang.NullPointerException expected) { - } + format = NumberFormat.getCurrencyInstance(atLocale); + // BEGIN android-changed: ICU uses non-breaking space after the euro sign; the RI uses ' '. + assertEquals("\u20ac\u00a035,76", format.format(35.76)); + assertEquals("\u20ac\u00a0123.456,79", format.format(123456.789)); + assertEquals("\u20ac\u00a00,10", format.format(0.1)); + assertEquals("\u20ac\u00a01,00", format.format(0.999)); + try { + NumberFormat.getCurrencyInstance(null); + fail("java.lang.NullPointerException is not thrown"); + } catch (java.lang.NullPointerException expected) { } } @@ -357,18 +343,17 @@ public class OldNumberFormatTest extends TestCase { } public void test_getInstanceLjava_util_Locale() { - Locale testLocale = new Locale("de", "CH"); + Locale de_CH = new Locale("de", "CH"); Locale.setDefault(Locale.US); - if (Support_Locale.isLocaleAvailable(testLocale)) { - NumberFormat format = NumberFormat.getInstance(testLocale); + NumberFormat format = NumberFormat.getInstance(de_CH); - assertNotSame(null, format); - assertTrue(format instanceof NumberFormat); + assertNotSame(null, format); + assertTrue(format instanceof NumberFormat); + + assertEquals("1'234'567'890.099", format.format(1234567890.0987654321)); + assertEquals("#,##0.###", ((DecimalFormat) format).toPattern()); + assertEquals("123'456'789", format.format(123456789)); - assertEquals("1'234'567'890.099", format.format(1234567890.0987654321)); - assertEquals("#,##0.###", ((DecimalFormat) format).toPattern()); - assertEquals("123'456'789", format.format(123456789)); - } try { NumberFormat.getInstance(null); fail("java.lang.NullPointerException is not thrown"); @@ -398,15 +383,14 @@ public class OldNumberFormatTest extends TestCase { public void test_getNumberInstanceLjava_util_Locale() { Locale.setDefault(Locale.US); Locale deLocale = new Locale("de", "CH"); - if (Support_Locale.isLocaleAvailable(deLocale)) { - NumberFormat format = NumberFormat.getNumberInstance(deLocale); - assertNotSame("Instance is null", null, format); - assertTrue("Object is not instance of NumberFormat", format instanceof NumberFormat); - - assertEquals("-1'234'567'890.099", format.format(-1234567890.0987654321)); - assertEquals("#,##0.###", ((DecimalFormat) format).toPattern()); - assertEquals("123'456'789", format.format(123456789)); - } + NumberFormat format = NumberFormat.getNumberInstance(deLocale); + assertNotSame("Instance is null", null, format); + assertTrue("Object is not instance of NumberFormat", format instanceof NumberFormat); + + assertEquals("-1'234'567'890.099", format.format(-1234567890.0987654321)); + assertEquals("#,##0.###", ((DecimalFormat) format).toPattern()); + assertEquals("123'456'789", format.format(123456789)); + try { NumberFormat.getInstance(null); fail("java.lang.NullPointerException is not thrown"); @@ -436,16 +420,15 @@ public class OldNumberFormatTest extends TestCase { public void test_getPercentInstanceLjava_util_Locale() { Locale csLocale = new Locale("cs", "CZ"); Locale.setDefault(Locale.US); - if (Support_Locale.isLocaleAvailable(csLocale)) { - NumberFormat format = NumberFormat.getPercentInstance(csLocale); - assertNotSame("Instance is null", null, format); - assertTrue("Object is not instance of NumberFormat", format instanceof NumberFormat); + NumberFormat format = NumberFormat.getPercentInstance(csLocale); + assertNotSame("Instance is null", null, format); + assertTrue("Object is not instance of NumberFormat", format instanceof NumberFormat); + + assertEquals("123\u00a0456\u00a0789\u00a0010\u00a0%", format.format(1234567890.0987654321)); + assertEquals("#,##0\u00a0%", ((DecimalFormat) format).toPattern()); + assertEquals("12\u00a0345\u00a0678\u00a0900\u00a0%", format.format(123456789)); - assertEquals("123\u00a0456\u00a0789\u00a0010\u00a0%", format.format(1234567890.0987654321)); - assertEquals("#,##0\u00a0%", ((DecimalFormat) format).toPattern()); - assertEquals("12\u00a0345\u00a0678\u00a0900\u00a0%", format.format(123456789)); - } try { NumberFormat.getInstance(null); fail("java.lang.NullPointerException is not thrown"); @@ -602,25 +585,23 @@ public class OldNumberFormatTest extends TestCase { "-1,234,567,890.1", nf1.format(-1234567890.1)); Locale csLocale = new Locale("cs", "CZ"); - if (Support_Locale.isLocaleAvailable(csLocale)) { - NumberFormat nf2 = NumberFormat.getPercentInstance(csLocale); - nf2.setGroupingUsed(false); + NumberFormat nf2 = NumberFormat.getPercentInstance(csLocale); + nf2.setGroupingUsed(false); - assertEquals("123456789010\u00a0%", nf2.format(1234567890.1)); + assertEquals("123456789010\u00a0%", nf2.format(1234567890.1)); - assertEquals("-123456789010\u00a0%", nf2.format(-1234567890.1)); - assertEquals("1,234,567,890.1", nf1.format(1234567890.1)); + assertEquals("-123456789010\u00a0%", nf2.format(-1234567890.1)); + assertEquals("1,234,567,890.1", nf1.format(1234567890.1)); - nf2.setGroupingUsed(true); - assertEquals("123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(1234567890.1)); + nf2.setGroupingUsed(true); + assertEquals("123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(1234567890.1)); - assertEquals("-123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(-1234567890.1)); + assertEquals("-123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(-1234567890.1)); - nf2.setGroupingUsed(true); - assertEquals("123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(1234567890.1)); + nf2.setGroupingUsed(true); + assertEquals("123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(1234567890.1)); - assertEquals("-123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(-1234567890.1)); - } + assertEquals("-123\u00a0456\u00a0789\u00a0010\u00a0%", nf2.format(-1234567890.1)); } public void test_isParseIntegerOnly() { diff --git a/luni/src/test/java/libcore/java/util/FormatterTest.java b/luni/src/test/java/libcore/java/util/FormatterTest.java index b512c19..043c06b 100644 --- a/luni/src/test/java/libcore/java/util/FormatterTest.java +++ b/luni/src/test/java/libcore/java/util/FormatterTest.java @@ -21,14 +21,11 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -import tests.support.Support_Locale; public class FormatterTest extends junit.framework.TestCase { public void test_numberLocalization() throws Exception { Locale arabic = new Locale("ar"); - if (!Support_Locale.isLocaleAvailable(arabic)) { - return; - } + // Check the fast path for %d: assertEquals("12 \u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\u0660 34", String.format(arabic, "12 %d 34", 1234567890)); diff --git a/luni/src/test/java/libcore/java/util/OldFormatterTest.java b/luni/src/test/java/libcore/java/util/OldFormatterTest.java index 53d8eb2..3b4788b 100644 --- a/luni/src/test/java/libcore/java/util/OldFormatterTest.java +++ b/luni/src/test/java/libcore/java/util/OldFormatterTest.java @@ -24,7 +24,6 @@ import java.util.IllegalFormatException; import java.util.IllegalFormatFlagsException; import java.util.Locale; import junit.framework.TestCase; -import tests.support.Support_Locale; public final class OldFormatterTest extends TestCase { @@ -59,21 +58,17 @@ public final class OldFormatterTest extends TestCase { Formatter fNoL = null; cal.set(2008, Calendar.SEPTEMBER, 23, 18, 30); - if (Support_Locale.isLocaleAvailable(Locale.GERMAN)) { - fLoc = new Formatter(Locale.GERMAN); - fNoL = new Formatter(Locale.GERMAN); - fLoc.format(Locale.US, "%f", val); - fNoL.format("%f", val); - assertFalse(fLoc.toString().equals(fNoL.toString())); - } + fLoc = new Formatter(Locale.GERMAN); + fNoL = new Formatter(Locale.GERMAN); + fLoc.format(Locale.US, "%f", val); + fNoL.format("%f", val); + assertFalse(fLoc.toString().equals(fNoL.toString())); - if (Support_Locale.isLocaleAvailable(Locale.FRANCE)) { - fLoc = new Formatter(Locale.FRANCE); - fNoL = new Formatter(Locale.FRANCE); - fLoc.format(Locale.US, "%f", val); - fNoL.format("%f", val); - assertFalse(fLoc.toString().equals(fNoL.toString())); - } + fLoc = new Formatter(Locale.FRANCE); + fNoL = new Formatter(Locale.FRANCE); + fLoc.format(Locale.US, "%f", val); + fNoL.format("%f", val); + assertFalse(fLoc.toString().equals(fNoL.toString())); fLoc = new Formatter(Locale.US); fNoL = new Formatter(Locale.US); @@ -81,21 +76,17 @@ public final class OldFormatterTest extends TestCase { fNoL.format("%f", val); assertTrue(fLoc.toString().equals(fNoL.toString())); - if (Support_Locale.isLocaleAvailable(Locale.GERMAN)) { - fLoc = new Formatter(Locale.GERMAN); - fNoL = new Formatter(Locale.GERMAN); - fLoc.format(Locale.US, "%tA %tB %td %tT", cal, cal, cal, cal); - fNoL.format("%tA %tB %td %tT", cal, cal, cal, cal); - assertFalse(fLoc.toString().equals(fNoL.toString())); - } + fLoc = new Formatter(Locale.GERMAN); + fNoL = new Formatter(Locale.GERMAN); + fLoc.format(Locale.US, "%tA %tB %td %tT", cal, cal, cal, cal); + fNoL.format("%tA %tB %td %tT", cal, cal, cal, cal); + assertFalse(fLoc.toString().equals(fNoL.toString())); - if (Support_Locale.isLocaleAvailable(Locale.FRANCE)) { - fLoc = new Formatter(Locale.FRANCE); - fNoL = new Formatter(Locale.FRANCE); - fLoc.format(Locale.US, "%tA %tB %td %tT", cal, cal, cal, cal); - fNoL.format("%tA %tB %td %tT", cal, cal, cal, cal); - assertFalse(fLoc.toString().equals(fNoL.toString())); - } + fLoc = new Formatter(Locale.FRANCE); + fNoL = new Formatter(Locale.FRANCE); + fLoc.format(Locale.US, "%tA %tB %td %tT", cal, cal, cal, cal); + fNoL.format("%tA %tB %td %tT", cal, cal, cal, cal); + assertFalse(fLoc.toString().equals(fNoL.toString())); fLoc = new Formatter(Locale.US); fNoL = new Formatter(Locale.US); @@ -107,31 +98,25 @@ public final class OldFormatterTest extends TestCase { "%+ a", "%+ A", "%-03e", "%-03E", "%-03g", "%-03G", "%-03f", "%-03a", "%-03A" }; for (int i = 0; i < illFlags.length; i++) { - if (Support_Locale.isLocaleAvailable(Locale.FRANCE)) { - try { - fLoc = new Formatter(Locale.US); - fLoc.format(Locale.FRANCE, illFlags[i], 1.23d); - fail("should throw IllegalFormatFlagsException"); - } catch (IllegalFormatFlagsException expected) { - } + try { + fLoc = new Formatter(Locale.US); + fLoc.format(Locale.FRANCE, illFlags[i], 1.23d); + fail("should throw IllegalFormatFlagsException"); + } catch (IllegalFormatFlagsException expected) { } - - if (Support_Locale.isLocaleAvailable(Locale.CANADA)) { - try { - fLoc = new Formatter(Locale.CANADA); - fLoc.format(Locale.GERMAN, illFlags[i], (Double) null); - fail("should throw IllegalFormatFlagsException"); - } catch (IllegalFormatFlagsException expected) { - } + try { + fLoc = new Formatter(Locale.CANADA); + fLoc.format(Locale.GERMAN, illFlags[i], (Double) null); + fail("should throw IllegalFormatFlagsException"); + } catch (IllegalFormatFlagsException expected) { } } - fLoc.close(); - if (Support_Locale.isLocaleAvailable(Locale.GERMAN)) { - try { - fLoc.format(Locale.GERMAN, "%f", val); - } catch (FormatterClosedException expected) { - } + fLoc.close(); + try { + fLoc.format(Locale.GERMAN, "%f", val); + fail(); + } catch (FormatterClosedException expected) { } } } diff --git a/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java b/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java index 03a49ca..713e1b5 100644 --- a/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java +++ b/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java @@ -22,7 +22,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; import junit.framework.TestCase; -import tests.support.Support_Locale; public class OldTimeZoneTest extends TestCase { @@ -93,10 +92,7 @@ public class OldTimeZoneTest extends TestCase { public void test_getDisplayNameLjava_util_Locale() { TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles"); assertEquals("Pacific Standard Time", tz.getDisplayName(new Locale("US"))); - if (Support_Locale.isLocaleAvailable(Locale.FRANCE)) { - // BEGIN android-note: RI has "Heure", CLDR/ICU has "heure". - assertEquals("heure normale du Pacifique", tz.getDisplayName(Locale.FRANCE)); - } + assertEquals("heure normale du Pacifique", tz.getDisplayName(Locale.FRANCE)); } public void test_getDisplayNameZI() { @@ -112,16 +108,12 @@ public class OldTimeZoneTest extends TestCase { TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles"); assertEquals("PST", tz.getDisplayName(false, 0, Locale.US)); assertEquals("Pacific Daylight Time", tz.getDisplayName(true, 1, Locale.US)); - if (Support_Locale.isLocaleAvailable(Locale.UK)) { - assertEquals("Pacific Standard Time", tz.getDisplayName(false, 1, Locale.UK)); - } - if (Support_Locale.isLocaleAvailable(Locale.FRANCE)) { - // RI always returns short time zone name as "PST" - // ICU zone/root.txt patched to allow metazone names. - assertEquals("PST", tz.getDisplayName(false, 0, Locale.FRANCE)); - assertEquals("heure avanc\u00e9e du Pacifique", tz.getDisplayName(true, 1, Locale.FRANCE)); - assertEquals("heure normale du Pacifique", tz.getDisplayName(false, 1, Locale.FRANCE)); - } + assertEquals("Pacific Standard Time", tz.getDisplayName(false, 1, Locale.UK)); + // RI always returns short time zone name as "PST" + // ICU zone/root.txt patched to allow metazone names. + assertEquals("PST", tz.getDisplayName(false, 0, Locale.FRANCE)); + assertEquals("heure avanc\u00e9e du Pacifique", tz.getDisplayName(true, 1, Locale.FRANCE)); + assertEquals("heure normale du Pacifique", tz.getDisplayName(false, 1, Locale.FRANCE)); } public void test_getID() { diff --git a/luni/src/test/java/tests/api/java/util/CurrencyTest.java b/luni/src/test/java/tests/api/java/util/CurrencyTest.java index c43d339..82fd7cf 100644 --- a/luni/src/test/java/tests/api/java/util/CurrencyTest.java +++ b/luni/src/test/java/tests/api/java/util/CurrencyTest.java @@ -17,8 +17,6 @@ package tests.api.java.util; -import tests.support.Support_Locale; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/luni/src/test/java/tests/api/java/util/LocaleTest.java b/luni/src/test/java/tests/api/java/util/LocaleTest.java index 43d50fb..7615a76 100644 --- a/luni/src/test/java/tests/api/java/util/LocaleTest.java +++ b/luni/src/test/java/tests/api/java/util/LocaleTest.java @@ -17,8 +17,6 @@ package tests.api.java.util; -import tests.support.Support_Locale; - import java.security.Permission; import java.util.Arrays; import java.util.HashSet; @@ -184,9 +182,7 @@ public class LocaleTest extends junit.framework.TestCase { } public void test_getDisplayCountryLjava_util_Locale() { - if (Support_Locale.isLocaleAvailable(Locale.ITALY)) { - assertEquals("Returned incorrect country", "Italie", Locale.ITALY.getDisplayCountry(l)); - } + assertEquals("Italie", Locale.ITALY.getDisplayCountry(new Locale("fr", "CA", "WIN32"))); } /** @@ -205,19 +201,15 @@ public class LocaleTest extends junit.framework.TestCase { } public void test_getDisplayLanguageLjava_util_Locale() { - if (Support_Locale.isLocaleAvailable(testLocale)) { - assertEquals("anglais", testLocale.getDisplayLanguage(l)); - } + assertEquals("anglais", new Locale("en", "CA", "WIN32").getDisplayLanguage(l)); } public void test_getDisplayName() { - assertEquals("English (Canada,WIN32)", testLocale.getDisplayName()); + assertEquals("English (Canada,WIN32)", new Locale("en", "CA", "WIN32").getDisplayName()); } public void test_getDisplayNameLjava_util_Locale() { - if (Support_Locale.isLocaleAvailable(testLocale)) { - assertEquals("anglais (Canada,WIN32)", testLocale.getDisplayName(l)); - } + assertEquals("anglais (Canada,WIN32)", new Locale("en", "CA", "WIN32").getDisplayName(l)); } /** @@ -358,8 +350,7 @@ public class LocaleTest extends junit.framework.TestCase { */ public void test_toString() { // Test for method java.lang.String java.util.Locale.toString() - assertEquals("Returned incorrect string representation", "en_CA_WIN32", testLocale - .toString()); + assertEquals("en_CA_WIN32", new Locale("en", "CA", "WIN32").toString()); Locale l = new Locale("en", ""); assertEquals("Wrong representation 1", "en", l.toString()); diff --git a/support/src/test/java/tests/support/Support_DecimalFormat.java b/support/src/test/java/tests/support/Support_DecimalFormat.java index 9baa4cc..89e226a 100644 --- a/support/src/test/java/tests/support/Support_DecimalFormat.java +++ b/support/src/test/java/tests/support/Support_DecimalFormat.java @@ -139,37 +139,26 @@ public class Support_DecimalFormat extends Support_Format { Locale us = Locale.US; Locale tr = new Locale("de", "CH"); - if (Support_Locale.isLocaleAvailable(us)) { - // locale dependent test, bug 1943269 + // test number instance + t_Format(1, number, NumberFormat.getNumberInstance(us), getNumberVectorUS()); - // test number instance - t_Format(1, number, NumberFormat.getNumberInstance(us), - getNumberVectorUS()); + // test integer instance + t_Format(2, number, NumberFormat.getIntegerInstance(us), getIntegerVectorUS()); - // test integer instance - t_Format(2, number, NumberFormat.getIntegerInstance(us), - getIntegerVectorUS()); + // test percent instance + t_Format(3, number, NumberFormat.getPercentInstance(us), getPercentVectorUS()); - // test percent instance - t_Format(3, number, NumberFormat.getPercentInstance(us), - getPercentVectorUS()); + // test currency instance with US Locale + t_Format(4, number, NumberFormat.getCurrencyInstance(us), getPositiveCurrencyVectorUS()); - // test currency instance with US Locale - t_Format(4, number, NumberFormat.getCurrencyInstance(us), - getPositiveCurrencyVectorUS()); + // test negative currency instance with US Locale + t_Format(5, negativeNumber, NumberFormat.getCurrencyInstance(us), getNegativeCurrencyVectorUS()); - // test negative currency instance with US Locale - t_Format(5, negativeNumber, NumberFormat.getCurrencyInstance(us), - getNegativeCurrencyVectorUS()); + // test multiple grouping separators + t_Format(6, longNumber, NumberFormat.getNumberInstance(us), getNumberVector2US()); - // test multiple grouping seperators - t_Format(6, longNumber, NumberFormat.getNumberInstance(us), - getNumberVector2US()); - - // test 0 - t_Format(7, zeroNumber, NumberFormat.getNumberInstance(us), - getZeroVector()); - } + // test 0 + t_Format(7, zeroNumber, NumberFormat.getNumberInstance(us), getZeroVector()); // test permille pattern DecimalFormat format = new DecimalFormat("###0.##\u2030"); @@ -183,15 +172,11 @@ public class Support_DecimalFormat extends Support_Format { format = new DecimalFormat("0000.0#E0"); t_Format(10, number, format, getNegativeExponentVector()); - if (Support_Locale.isLocaleAvailable(tr)) { - // test currency instance with TR Locale - t_Format(11, number, NumberFormat.getCurrencyInstance(tr), - getPositiveCurrencyVectorCH()); + // test currency instance with TR Locale + t_Format(11, number, NumberFormat.getCurrencyInstance(tr), getPositiveCurrencyVectorCH()); - // test negative currency instance with TR Locale - t_Format(12, negativeNumber, NumberFormat.getCurrencyInstance(tr), - getNegativeCurrencyVectorCH()); - } + // test negative currency instance with TR Locale + t_Format(12, negativeNumber, NumberFormat.getCurrencyInstance(tr), getNegativeCurrencyVectorCH()); } private static Vector<FieldContainer> getNumberVectorUS() { diff --git a/support/src/test/java/tests/support/Support_Locale.java b/support/src/test/java/tests/support/Support_Locale.java deleted file mode 100644 index 68f01c5..0000000 --- a/support/src/test/java/tests/support/Support_Locale.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package tests.support; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Locale; -import java.util.Set; - -/** - * Helper class for tests that rely on locale data. - */ -public class Support_Locale { - public static boolean isLocaleAvailable(Locale requiredLocale) { - Set<Locale> localeSet = new HashSet<Locale>(Arrays.asList(Locale.getAvailableLocales())); - return localeSet.contains(requiredLocale); - } -} |