ICU-9150 Workaround for locale SPI tests on Java 7 environment.

X-SVN-Rev: 31537

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 f4f2ac43cb3b48b9bc4efe89bccbfe50e1c996b9..1da80ebdb95ebfd6007a5006761b437d9622f49e 100644 (file)
--- 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-2010, International Business Machines Corporation and    *
+ * Copyright (C) 2008-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -60,9 +60,15 @@ public class CurrencyNameTest extends TestFmwk {
                     continue;
                 }
 
+                // Note: Short term workaround for Java locale with script.
+                //       Java Locale with non-empty script cannot have variant "ICU"
+                //       because it's not well-formed as BCP 47. Because we cannot
+                //       build such Locale, we skip the check below for now.
+                boolean ignoreErrorForNow = TestUtil.hasScript(loc);
+
                 if (TestUtil.isICUExtendedLocale(loc)) {
                     if (!curSymbol.equals(curSymbolIcu)) {
-                        if (!curSymbol.equals(curSymbolIcu)) {
+                        if (!curSymbol.equals(curSymbolIcu) && !ignoreErrorForNow) {
                             errln("FAIL: Currency symbol for " + currencyCode + " by ICU is " + curSymbolIcu
                                     + ", but got " + curSymbol + " in locale " + loc);
                         }
@@ -75,7 +81,7 @@ public class CurrencyNameTest extends TestFmwk {
                     // Try explicit ICU locale (xx_yy_ICU)
                     Locale locIcu = TestUtil.toICUExtendedLocale(loc);
                     curSymbol = currency.getSymbol(locIcu);
-                    if (!curSymbol.equals(curSymbolIcu)) {
+                    if (!curSymbol.equals(curSymbolIcu) && !ignoreErrorForNow) {
                         errln("FAIL: Currency symbol for " + currencyCode + " by ICU is " + curSymbolIcu
                                 + ", but got " + curSymbol + " in locale " + locIcu);
                     }

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 714243944e7ca039feda256d0a2285325f3ebc62..0ba5eeff6e1e0d3773b799e558692c3e41e0eb7b 100644 (file)
--- 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, International Business Machines Corporation and         *
+ * Copyright (C) 2008-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -53,9 +53,16 @@ public class LocaleNameTest extends TestFmwk {
                 }
 
                 String name = forLocale.getDisplayLanguage(inLocale);
+
+                // Note: Short term workaround for Java locale with script.
+                //       Java Locale with non-empty script cannot have variant "ICU"
+                //       because it's not well-formed as BCP 47. Because we cannot
+                //       build such Locale, we skip the check below for now.
+                boolean ignoreErrorForNow = TestUtil.hasScript(inLocale);
+
                 if (TestUtil.isICUExtendedLocale(inLocale)) {
                     // The name should be taken from ICU
-                    if (!name.equals(icuname)) {
+                    if (!name.equals(icuname) && !ignoreErrorForNow) {
                         errln("FAIL: Language name by ICU is " + icuname + ", but got " + name
                                 + " for locale " + forLocale + " in locale " + inLocale);
                     }
@@ -66,7 +73,7 @@ public class LocaleNameTest extends TestFmwk {
                     }
                     // Try explicit ICU locale (xx_yy_ICU)
                     name = forLocale.getDisplayLanguage(inLocaleICU);
-                    if (!name.equals(icuname)) {
+                    if (!name.equals(icuname) && !ignoreErrorForNow) {
                         errln("FAIL: Language name by ICU is " + icuname + ", but got " + name
                               + " for locale " + forLocale + " in locale " + inLocaleICU);
                     }

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 9e126fe226619979505060434a223cf501b10ac9..7bde2cf7a6af25ac571dc49a1a6f5ce1a720372a 100644 (file)
--- 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,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2008-2009, International Business Machines Corporation and    *
+ * Copyright (C) 2008-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -8,6 +8,8 @@ package com.ibm.icu.dev.test.localespi;
 
 import java.util.Locale;
 
+import com.ibm.icu.util.ULocale;
+
 public class TestUtil {
 
     private static final String ICU_VARIANT = "ICU";
@@ -99,4 +101,14 @@ public class TestUtil {
         }
         return false;
     }
+
+    /**
+     * Check if the given Locale has script field (Java 7+)
+     * @param locale the locale
+     * @return true if the given Locale has non-empty script
+     */
+    public static boolean hasScript(Locale locale) {
+        ULocale uloc = ULocale.forLocale(locale);
+        return uloc.getScript().length() > 0;
+    }
 }

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 dea02860a539deb8dba63b6ca5098867249b587f..19d2bbc27693bb315321d82a29cbb3f0bc18ad51 100644 (file)
--- 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-2010, International Business Machines Corporation and    *
+ * Copyright (C) 2008-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -91,10 +91,17 @@ public class TimeZoneNameTest extends TestFmwk {
         String styleStr = (style == TimeZone.SHORT) ? "SHORT" : "LONG";
 
         String name = tz.getDisplayName(daylight, style, loc);
+
+        // Note: Short term workaround for Java locale with script.
+        //       Java Locale with non-empty script cannot have variant "ICU"
+        //       because it's not well-formed as BCP 47. Because we cannot
+        //       build such Locale, we skip the check below for now.
+        boolean ignoreErrorForNow = TestUtil.hasScript(loc);
+
         if (TestUtil.isICUExtendedLocale(loc)) {
             // The name should be taken from ICU
             if (!name.equals(icuname)) {
-                if (warnOnly) {
+                if (warnOnly || ignoreErrorForNow) {
                     logln("WARNING: TimeZone name by ICU is " + icuname + ", but got " + name
                             + " for time zone " + tz.getID() + " in locale " + loc
                             + " (daylight=" + daylight + ", style=" + styleStr + ")");
@@ -115,7 +122,7 @@ public class TimeZoneNameTest extends TestFmwk {
             Locale icuLoc = TestUtil.toICUExtendedLocale(loc);
             name = tz.getDisplayName(daylight, style, icuLoc);
             if (!name.equals(icuname)) {
-                if (warnOnly) {
+                if (warnOnly || ignoreErrorForNow) {
                     logln("WARNING: TimeZone name by ICU is " + icuname + ", but got " + name
                             + " for time zone " + tz.getID() + " in locale " + icuLoc
                             + " (daylight=" + daylight + ", style=" + styleStr + ")");