diff options
author | Fredrik Roubert <roubert@google.com> | 2015-03-02 22:12:10 +0100 |
---|---|---|
committer | Fredrik Roubert <roubert@google.com> | 2018-05-31 16:40:01 -0700 |
commit | 1064c33cb449ef5f2caac01db1a006d6b108571a (patch) | |
tree | b9bb9318970b75be6ce0b9594a4183d350db732e /icu4j/main | |
parent | 5438dc3bbf5035a756cae8350dd7c99d214abc23 (diff) | |
download | icu-1064c33cb449ef5f2caac01db1a006d6b108571a.tar.gz |
Android patch: Add exceptions for big5han and gb2312han in genrb.
This change was introduced in Android by the ICU 53 upgrade:
https://android.googlesource.com/platform/external/icu/+/fceb398
Suppression of ICU4J test errors was added for ICU 55:
https://android.googlesource.com/platform/external/icu/+/7b913b1
(cherry picked from commit d9fc98087b091be81a9a50fbff9c0e22855d8dac)
Change-Id: I3643d41166914d33e884dd87d0b5111716ac4063
Diffstat (limited to 'icu4j/main')
-rw-r--r-- | icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java index 009613adf..93808e784 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java @@ -30,6 +30,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { @Test public void TestFunctionalEquivalent(){ + // Android patch: Add exceptions for big5han and gb2312han in genrb. String[] collCases = { // avail locale equiv "f", "sv_US_CALIFORNIA", "sv", @@ -48,19 +49,19 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { "f", "zh_MO", "zh@collation=stroke", /* alias of zh_Hant_MO */ "f", "zh_Hant_MO", "zh@collation=stroke", "f", "zh_TW_STROKE", "zh@collation=stroke", - "f", "zh_TW_STROKE@collation=big5han", "zh@collation=big5han", + // "f", "zh_TW_STROKE@collation=big5han", "zh@collation=big5han", "f", "sv_CN@calendar=japanese", "sv", "t", "sv@calendar=japanese", "sv", - "f", "zh_TW@collation=big5han", "zh@collation=big5han", /* alias of zh_Hant_TW */ - "f", "zh_Hant_TW@collation=big5han", "zh@collation=big5han", - "f", "zh_TW@collation=gb2312han", "zh@collation=gb2312han", /* alias of zh_Hant_TW */ - "f", "zh_Hant_TW@collation=gb2312han", "zh@collation=gb2312han", - "f", "zh_CN@collation=big5han", "zh@collation=big5han", /* alias of zh_Hans_CN */ - "f", "zh_Hans_CN@collation=big5han", "zh@collation=big5han", - "f", "zh_CN@collation=gb2312han", "zh@collation=gb2312han", /* alias of zh_Hans_CN */ - "f", "zh_Hans_CN@collation=gb2312han", "zh@collation=gb2312han", - "t", "zh@collation=big5han", "zh@collation=big5han", - "t", "zh@collation=gb2312han", "zh@collation=gb2312han", + // "f", "zh_TW@collation=big5han", "zh@collation=big5han", /* alias of zh_Hant_TW */ + // "f", "zh_Hant_TW@collation=big5han", "zh@collation=big5han", + // "f", "zh_TW@collation=gb2312han", "zh@collation=gb2312han", /* alias of zh_Hant_TW */ + // "f", "zh_Hant_TW@collation=gb2312han", "zh@collation=gb2312han", + // "f", "zh_CN@collation=big5han", "zh@collation=big5han", /* alias of zh_Hans_CN */ + // "f", "zh_Hans_CN@collation=big5han", "zh@collation=big5han", + // "f", "zh_CN@collation=gb2312han", "zh@collation=gb2312han", /* alias of zh_Hans_CN */ + // "f", "zh_Hans_CN@collation=gb2312han", "zh@collation=gb2312han", + // "t", "zh@collation=big5han", "zh@collation=big5han", + // "t", "zh@collation=gb2312han", "zh@collation=gb2312han", "t", "hi@collation=standard", "hi", "f", "hi_AU@collation=standard;currency=CHF;calendar=buddhist", "hi", "f", "sv_SE@collation=pinyin", "sv", /* bug 4582 tests */ @@ -72,6 +73,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { "f", "nl_NL@collation=stroke", "root", "f", "nl_NL_EEXT@collation=stroke", "root", }; + // Android patch end. logln("Testing functional equivalents for collation..."); getFunctionalEquivalentTestCases(ICUData.ICU_COLLATION_BASE_NAME, |