diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/BreakIteratorTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/BreakIteratorTest.java index afbd308f3a7..614e311cec8 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/BreakIteratorTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/BreakIteratorTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -26,7 +26,7 @@ public class BreakIteratorTest extends TestFmwk { */ public void TestGetInstance() { for (Locale loc : BreakIterator.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CollatorTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CollatorTest.java index 9b4677801b3..e51ed6b823e 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CollatorTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CollatorTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -24,7 +24,7 @@ public class CollatorTest extends TestFmwk { */ public void TestGetInstance() { for (Locale loc : Collator.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CurrencyNameTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CurrencyNameTest.java index 599e1e011c2..7f8080c1f95 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CurrencyNameTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/CurrencyNameTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -61,7 +61,7 @@ public class CurrencyNameTest extends TestFmwk { String currencyCode = currency.getCurrencyCode(); com.ibm.icu.util.Currency currencyIcu = com.ibm.icu.util.Currency.getInstance(currencyCode); for (Locale loc : Locale.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } @@ -110,7 +110,7 @@ public class CurrencyNameTest extends TestFmwk { String currencyCode = currency.getCurrencyCode(); com.ibm.icu.util.Currency currencyIcu = com.ibm.icu.util.Currency.getInstance(currencyCode); for (Locale loc : Locale.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatSymbolsTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatSymbolsTest.java index 770430e2a95..29a5e82592c 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatSymbolsTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatSymbolsTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -22,7 +22,7 @@ public class DateFormatSymbolsTest extends TestFmwk { */ public void TestGetInstance() { for (Locale loc : DateFormatSymbols.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatTest.java index 8f2c0b672aa..a99f8a8b51f 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DateFormatTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -27,7 +27,7 @@ public class DateFormatTest extends TestFmwk { */ public void TestGetInstance() { for (Locale loc : DateFormat.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DecimalFormatSymbolsTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DecimalFormatSymbolsTest.java index d1fb4c64aa4..02e702fc76f 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DecimalFormatSymbolsTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/DecimalFormatSymbolsTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2014, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -23,7 +23,7 @@ public class DecimalFormatSymbolsTest extends TestFmwk { */ public void TestGetInstance() { for (Locale loc : DecimalFormatSymbols.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/LocaleNameTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/LocaleNameTest.java index 34cb1ef7874..05f4f4a3aeb 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/LocaleNameTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/LocaleNameTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -35,7 +35,7 @@ public class LocaleNameTest extends TestFmwk { Locale[] locales = Locale.getAvailableLocales(); StringBuffer icuid = new StringBuffer(); for (Locale inLocale : locales) { - if (TestUtil.isProblematicIBMLocale(inLocale)) { + if (TestUtil.isExcluded(inLocale)) { logln("Skipped " + inLocale); continue; } @@ -99,7 +99,7 @@ public class LocaleNameTest extends TestFmwk { Locale[] locales = Locale.getAvailableLocales(); for (Locale inLocale : locales) { - if (TestUtil.isProblematicIBMLocale(inLocale)) { + if (TestUtil.isExcluded(inLocale)) { logln("Skipped " + inLocale); continue; } @@ -155,7 +155,7 @@ public class LocaleNameTest extends TestFmwk { public void TestCountryNames() { Locale[] locales = Locale.getAvailableLocales(); for (Locale inLocale : locales) { - if (TestUtil.isProblematicIBMLocale(inLocale)) { + if (TestUtil.isExcluded(inLocale)) { logln("Skipped " + inLocale); continue; } @@ -214,7 +214,7 @@ public class LocaleNameTest extends TestFmwk { } for (Locale inLocale : locales) { - if (TestUtil.isProblematicIBMLocale(inLocale)) { + if (TestUtil.isExcluded(inLocale)) { logln("Skipped " + inLocale); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/NumberFormatTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/NumberFormatTest.java index 4ae63877a2a..cbc22cd348d 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/NumberFormatTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/NumberFormatTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -31,7 +31,7 @@ public class NumberFormatTest extends TestFmwk { */ public void TestGetInstance() { for (Locale loc : NumberFormat.getAvailableLocales()) { - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { logln("Skipped " + loc); continue; } diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TestUtil.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TestUtil.java index f182d911488..f2104865c28 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TestUtil.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TestUtil.java @@ -1,12 +1,14 @@ /* ******************************************************************************* - * Copyright (C) 2008-2012, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ package com.ibm.icu.dev.test.localespi; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; import com.ibm.icu.util.ULocale; import com.ibm.icu.util.ULocale.Builder; @@ -95,6 +97,23 @@ public class TestUtil { return IBMJRE; } + private static final Set EXCLUDED_LOCALES = new HashSet(); + static { + EXCLUDED_LOCALES.add(Locale.ROOT); + // de-GR is supported by Java 8, but not supported by CLDR / ICU + EXCLUDED_LOCALES.add(new Locale("de", "GR")); + } + + /* + * Checks if the given locale is excluded from locale SPI test + */ + public static boolean isExcluded(Locale loc) { + if (EXCLUDED_LOCALES.contains(loc)) { + return true; + } + return isProblematicIBMLocale(loc); + } + /* * Ticket#6368 * diff --git a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TimeZoneNameTest.java b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TimeZoneNameTest.java index f2d86baacfa..f1cfcb420ee 100644 --- a/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TimeZoneNameTest.java +++ b/icu4j/main/tests/localespi/src/com/ibm/icu/dev/test/localespi/TimeZoneNameTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2014, International Business Machines Corporation and * + * Copyright (C) 2008-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -43,7 +43,7 @@ public class TimeZoneNameTest extends TestFmwk { for (Locale loc : locales) { boolean warningOnly = false; - if (TestUtil.isProblematicIBMLocale(loc)) { + if (TestUtil.isExcluded(loc)) { warningOnly = true; }