diff options
| author | Fredrik Roubert <roubert@google.com> | 2015-03-20 20:33:20 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2015-10-02 12:35:48 +0200 |
| commit | c54a3d4515de7c6af9cfeddede0c19a70ce2cb04 (patch) | |
| tree | 2df62cb43b452fa1e814973fb64aa54431670344 /icu4j | |
| parent | 0543b35044dd6fbe8476249421a82c31590ada1d (diff) | |
| download | icu-c54a3d4515de7c6af9cfeddede0c19a70ce2cb04.tar.gz | |
Android patch: ICU4J: Add exceptions for big5han and gb2312han in genrb.
This changes ICU4J tests to expect the changes made to Android ICU4C:
https://android.googlesource.com/platform/external/icu/+/5775160
Change-Id: I6db565e5a739822a18da3941c0db47efb1257c7f
Diffstat (limited to 'icu4j')
| -rw-r--r-- | icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java | 26 |
1 files changed, 14 insertions, 12 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 589ad2a66..f1d6a6488 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 @@ -26,10 +26,11 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { } public void TestFunctionalEquivalent(){ + // Android patch: Add exceptions for big5han and gb2312han in genrb. String[] collCases = { // avail locale equiv "f", "sv_US_CALIFORNIA", "sv", - "f", "zh_TW@collation=stroke", "zh@collation=stroke", /* alias of zh_Hant_TW */ + // "f", "zh_TW@collation=stroke", "zh@collation=stroke", /* alias of zh_Hant_TW */ "f", "zh_Hant_TW@collation=stroke", "zh@collation=stroke", "f", "sv_CN@collation=pinyin", "sv", "t", "zh@collation=pinyin", "zh", @@ -44,19 +45,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 */ @@ -68,6 +69,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(ICUResourceBundle.ICU_COLLATION_BASE_NAME, |