From 1bf3215b3f317679a4141b306652d279775ab0b6 Mon Sep 17 00:00:00 2001 From: John Emmons Date: Fri, 6 Mar 2015 23:05:45 +0000 Subject: [PATCH] ICU-11555 Integrate CLDR 27 data X-SVN-Rev: 37170 --- .../core/src/com/ibm/icu/util/Region.java | 18 +++---- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 4 +- .../dev/test/util/ULocaleCollationTest.java | 4 +- .../icu/dev/test/format/DateFormatTest.java | 8 ++-- .../test/format/DateIntervalFormatTest.java | 48 +++++++++---------- .../test/format/DateTimeGeneratorTest.java | 8 ++-- .../icu/dev/test/format/MeasureUnitTest.java | 18 +++---- .../format/RelativeDateTimeFormatterTest.java | 4 +- .../icu/dev/test/util/DebugUtilitiesData.java | 2 +- .../ibm/icu/dev/test/util/LocaleDataTest.java | 12 ++--- .../ibm/icu/dev/test/util/ULocaleTest.java | 4 +- 13 files changed, 69 insertions(+), 67 deletions(-) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Region.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Region.java index a1ecd8c0850..cba701f05df 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/Region.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Region.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2011-2014, International Business Machines Corporation * + * Copyright (C) 2011-2015, International Business Machines Corporation * * All Rights Reserved. * ******************************************************************************* */ @@ -154,20 +154,22 @@ public class Region implements Comparable { UResourceBundle regionCodes = null; + UResourceBundle metadataAlias = null; UResourceBundle territoryAlias = null; UResourceBundle codeMappings = null; UResourceBundle worldContainment = null; UResourceBundle territoryContainment = null; UResourceBundle groupingContainment = null; - UResourceBundle rb = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"metadata",ICUResourceBundle.ICU_DATA_CLASS_LOADER); - regionCodes = rb.get("regionCodes"); - territoryAlias = rb.get("territoryAlias"); + UResourceBundle metadata = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"metadata",ICUResourceBundle.ICU_DATA_CLASS_LOADER); + regionCodes = metadata.get("regionCodes"); + metadataAlias = metadata.get("alias"); + territoryAlias = metadataAlias.get("territory"); - UResourceBundle rb2 = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); - codeMappings = rb2.get("codeMappings"); + UResourceBundle supplementalData = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); + codeMappings = supplementalData.get("codeMappings"); - territoryContainment = rb2.get("territoryContainment"); + territoryContainment = supplementalData.get("territoryContainment"); worldContainment = territoryContainment.get("001"); groupingContainment = territoryContainment.get("grouping"); @@ -200,7 +202,7 @@ public class Region implements Comparable { for ( int i = 0 ; i < territoryAlias.getSize(); i++ ) { UResourceBundle res = territoryAlias.get(i); String aliasFrom = res.getKey(); - String aliasTo = res.getString(); + String aliasTo = res.get("replacement").getString(); if ( regionIDMap.containsKey(aliasTo) && !regionIDMap.containsKey(aliasFrom) ) { // This is just an alias from some string to a region regionAliases.put(aliasFrom, regionIDMap.get(aliasTo)); diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index ba547afd20d..52a06bc59b6 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c755cc9518cf40c70a251694c4f10cc8942f0d837b0894ded42bf23afa544ee -size 11868974 +oid sha256:bbfc75cd51b0b67b76393b67e138576150b22650a64b8ab036499e510dfe7e25 +size 11850594 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 1452b92b4f2..192335e4606 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bba5e69e2602c2a121977ede7224e4126ce04905831fb048bef10cb59ec822f2 +oid sha256:39baedbfb3fd5d79647ca840340552422c86c2f62a7b332c330fc4f30b7a5e51 size 90574 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 5b0522c351e..7f55b0561c6 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c86143997cbc37300ed28950dd24d6d00a3b72ca7b6085ef875b2b6348ad7f77 -size 812408 +oid sha256:4151de944d2009c0b9ff3bd87584163679f0800e8d0e4fef4580293a936181a7 +size 812477 diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java index 04594732471..d5cacac95eb 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java @@ -267,7 +267,7 @@ public class ULocaleCollationTest extends TestFmwk { }, {{"en-gb", "fr", "zh-Hant", "zh-SG", "sr", "sr-Latn"}, {"Anglais (Royaume-Uni)", "English (United Kingdom)", "en_GB", "en_GB"}, - {"Chinois (simplifié, Singapour)", "中文（简体中文、新加坡）", "zh_SG", "zh_Hans_SG"}, + {"Chinois (simplifié, Singapour)", "中文（简体、新加坡）", "zh_SG", "zh_Hans_SG"}, {"Chinois (traditionnel, Taïwan)", "中文（繁體，台灣）", "zh_Hant", "zh_Hant_TW"}, {"Français", "Français", "fr", "fr"}, {"Serbe (cyrillique)", "Српски (ћирилица)", "sr", "sr_Cyrl"}, @@ -316,4 +316,4 @@ public class ULocaleCollationTest extends TestFmwk { } } -} \ No newline at end of file +} diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java index 4d0933e96e2..3dc7a2c3f83 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -2947,10 +2947,10 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { "ccccc", "1970 01 02 0:00:00", "P", "ccccc", "1970 01 03 0:00:00", "S", - "h:mm a", "2015 01 01 10:00:00", "10:00 AM", - "h:mm a", "2015 01 01 22:00:00", "10:00 PM", - "h:mm aaaaa", "2015 01 01 10:00:00", "10:00 AM", - "h:mm aaaaa", "2015 01 01 22:00:00", "10:00 PM", + "h:mm a", "2015 01 01 10:00:00", "10:00 dopoledne", + "h:mm a", "2015 01 01 22:00:00", "10:00 odpoledne", + "h:mm aaaaa", "2015 01 01 10:00:00", "10:00 dop.", + "h:mm aaaaa", "2015 01 01 22:00:00", "10:00 odp.", }; String CA_DATA[] = { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java index d6266d7ea73..7e924d6d01b 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2001-2014, International Business Machines Corporation and * + * Copyright (C) 2001-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -417,7 +417,7 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk { "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "EEEEdMMMM", "10\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f311\\u670810\\u65e5\\u661f\\u671f\\u516d", - "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4\\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4\\u4E0A\\u534810:10", + "zh", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", @@ -450,7 +450,7 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk { "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "MMMM", "\\u5341\\u4E00\\u6708", // (fixed expected result per ticket 6872<-6626 and others) - "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8\\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8\\u4e0a\\u534810:10", + "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10", "zh", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6", @@ -627,47 +627,47 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk { // Thai (default calendar buddhist) - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18 10 \\u0E15.\\u0E04. 2550 - \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C 10 \\u0E15.\\u0E04. 2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2550 \\u2013 \\u0E27\\u0E31\\u0E19\\u0E28\\u0E38\\u0E01\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. 2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 - 10 \\u0E15.\\u0E04. 2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. 2550 \\u2013 10 \\u0E15.\\u0E04. 2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 - \\u0E15.\\u0E04. 2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "MMMy", "\\u0E15.\\u0E04. 2550 \\u2013 \\u0E15.\\u0E04. 2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 - \\u0E28. 10/10/2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdMy", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 - 10/10/2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "dMy", "10/10/2550 \\u2013 10/10/2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 - 10/2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "My", "10/2550 \\u2013 10/2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 - \\u0E28. 10/10/2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "EdM", "\\u0E1E. 10/10/2550 \\u2013 \\u0E28. 10/10/2551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550-2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "y", "2550\\u20132551", - "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 - 10/2551", + "th", "2550 10 10 10:10:10", "2551 10 10 10:10:10", "M", "10/2550 \\u2013 10/2551", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18 10 \\u0E15.\\u0E04. - \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C 10 \\u0E1E.\\u0E22. 2550", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "EEEEdMMMy", "\\u0E27\\u0E31\\u0E19\\u0E1E\\u0E38\\u0E18\\u0E17\\u0E35\\u0E48 10 \\u0E15.\\u0E04. \\u2013 \\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48 10 \\u0E1E.\\u0E22. 2550", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. - 10 \\u0E1E.\\u0E22.", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dMMM", "10 \\u0E15.\\u0E04. \\u2013 10 \\u0E1E.\\u0E22.", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.-\\u0E1E.\\u0E22. 2550", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMMy", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22. 2550", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dM", "10/10 - 10/11", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "dM", "10/10 \\u2013 10/11", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 - 11/2550", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "My", "10/2550 \\u2013 11/2550", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "d", "10/10 - 10/11", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "d", "10/10 \\u2013 10/11", "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "y", "\u0E1E.\u0E28. 2550", - "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.-\\u0E1E.\\u0E22.", + "th", "2550 10 10 10:10:10", "2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22.", }; expect(DATA, DATA.length); @@ -748,17 +748,17 @@ public class DateIntervalFormatTest extends com.ibm.icu.dev.test.TestFmwk { "de", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "10. Jan. 2007", - "es", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "10 de oct. de 2007 --- 10 de oct. de 2008", + "es", "2007 10 10 10:10:10", "2008 10 10 10:10:10", "10 oct. 2007 --- 10 oct. 2008", "es", "2007 10 10 10:10:10", "2007 11 10 10:10:10", "2007 oct. 10 - nov. 2007", - "es", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "10 de nov. de 2007 --- 20 de nov. de 2007", + "es", "2007 11 10 10:10:10", "2007 11 20 10:10:10", "10 nov. 2007 --- 20 nov. 2007", - "es", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "10 de ene. de 2007", + "es", "2007 01 10 10:00:10", "2007 01 10 14:10:10", "10 ene. 2007", - "es", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "10 de ene. de 2007", + "es", "2007 01 10 10:00:10", "2007 01 10 10:20:10", "10 ene. 2007", - "es", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "10 de ene. de 2007", + "es", "2007 01 10 10:10:10", "2007 01 10 10:10:20", "10 ene. 2007", }; expectUserDII(DATA, DATA.length); } diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index 302a3f86a8e..10060ce5120 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -348,11 +348,11 @@ public class DateTimeGeneratorTest extends TestFmwk { new ULocale("es"), new String[] {"yM", "1/1999"}, - new String[] {"yMMM", "ene. de 1999"}, + new String[] {"yMMM", "ene. 1999"}, new String[] {"yMd", "13/1/1999"}, - new String[] {"yMMMd", "13 de ene. de 1999"}, + new String[] {"yMMMd", "13 ene. 1999"}, new String[] {"Md", "13/1"}, - new String[] {"MMMd", "13 de ene."}, + new String[] {"MMMd", "13 ene."}, new String[] {"MMMMd", "13 de enero"}, new String[] {"yQQQ", "T1 1999"}, new String[] {"hhmm", "11:58 p. m."}, @@ -360,7 +360,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"jjmm", "23:58"}, new String[] {"mmss", "58:59"}, new String[] {"yyyyMMMM", "enero de 1999"}, - new String[] {"MMMEd", "mi\u00E9., 13 de ene."}, + new String[] {"MMMEd", "mi\u00E9., 13 ene."}, new String[] {"Ed", "mi\u00E9. 13"}, new String[] {"jmmssSSS", "23:58:59,123"}, new String[] {"JJmm", "23:58"}, diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java index eb63b6f1a19..ec6886442b2 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2013-2014, International Business Machines Corporation and * + * Copyright (C) 2013-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -500,11 +500,11 @@ public class MeasureUnitTest extends TestFmwk { {_1h_0m_23s, "1 hour, 0 minutes, 23 seconds"}, {_2y_5M_3w_4d, "2 years, 5 months, 3 weeks, 4 days"}}; Object[][] abbrevData = { - {_1m_59_9996s, "1 min, 59.9996 secs"}, - {_19m, "19 mins"}, - {_1h_23_5s, "1 hr, 23.5 secs"}, - {_1h_23_5m, "1 hr, 23.5 mins"}, - {_1h_0m_23s, "1 hr, 0 mins, 23 secs"}, + {_1m_59_9996s, "1 min, 59.9996 sec"}, + {_19m, "19 min"}, + {_1h_23_5s, "1 hr, 23.5 sec"}, + {_1h_23_5m, "1 hr, 23.5 min"}, + {_1h_0m_23s, "1 hr, 0 min, 23 sec"}, {_2y_5M_3w_4d, "2 yrs, 5 mths, 3 wks, 4 days"}}; Object[][] narrowData = { {_1m_59_9996s, "1m 59.9996s"}, @@ -876,9 +876,9 @@ public class MeasureUnitTest extends TestFmwk { assertEquals("numeric currency", "$2.00", mf.format(USD_2)); mf = MeasureFormat.getInstance(ULocale.JAPAN, FormatWidth.WIDE); - assertEquals("Wide currency", "-1.00 \u7C73\u30C9\u30EB", mf.format(USD_NEG_1)); - assertEquals("Wide currency", "1.00 \u7C73\u30C9\u30EB", mf.format(USD_1)); - assertEquals("Wide currency", "2.00 \u7C73\u30C9\u30EB", mf.format(USD_2)); + assertEquals("Wide currency", "-1.00\u7C73\u30C9\u30EB", mf.format(USD_NEG_1)); + assertEquals("Wide currency", "1.00\u7C73\u30C9\u30EB", mf.format(USD_1)); + assertEquals("Wide currency", "2.00\u7C73\u30C9\u30EB", mf.format(USD_2)); } public void testFieldPosition() { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java index 23e7fe82b86..59e0a64dee5 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2013-2014, International Business Machines Corporation and * + * Copyright (C) 2013-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -628,7 +628,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk { public void TestTwoBeforeTwoAfter() { Object[][] data = { {Direction.NEXT_2, AbsoluteUnit.DAY, "pasado ma\u00F1ana"}, - {Direction.LAST_2, AbsoluteUnit.DAY, "antes de ayer"}, + {Direction.LAST_2, AbsoluteUnit.DAY, "anteayer"}, }; RelativeDateTimeFormatter fmt = RelativeDateTimeFormatter.getInstance(new ULocale("es")); for (Object[] row : data) { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java index 863025a19e8..69d766bdb67 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java @@ -7,7 +7,7 @@ package com.ibm.icu.dev.test.util; public class DebugUtilitiesData extends Object { - public static final String ICU4C_VERSION="55.0.1"; + public static final String ICU4C_VERSION="55.1"; public static final int UDebugEnumType = 0; public static final int UCalendarDateFields = 1; public static final int UCalendarMonths = 2; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleDataTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleDataTest.java index 4f7a61c99f4..b03de30ae36 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleDataTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleDataTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2003-2014, International Business Machines Corporation and * + * Copyright (C) 2003-2015, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -373,13 +373,13 @@ public class LocaleDataTest extends TestFmwk{ public void TestFallback(){ LocaleData fr_FR = LocaleData.getInstance(ULocale.FRANCE); - LocaleData fr_CA = LocaleData.getInstance(ULocale.CANADA_FRENCH); + LocaleData fr_CH = LocaleData.getInstance(new ULocale("fr_CH")); // This better not crash when only some values are overridden - assertEquals("Start quotes are not equal", fr_FR.getDelimiter(LocaleData.QUOTATION_START), fr_CA.getDelimiter(LocaleData.QUOTATION_START)); - assertEquals("End quotes are not equals", fr_FR.getDelimiter(LocaleData.QUOTATION_END), fr_CA.getDelimiter(LocaleData.QUOTATION_END)); - assertNotEquals("Alt start quotes are equal", fr_FR.getDelimiter(LocaleData.ALT_QUOTATION_START), fr_CA.getDelimiter(LocaleData.ALT_QUOTATION_START)); - assertNotEquals("Alt end quotes are equals", fr_FR.getDelimiter(LocaleData.ALT_QUOTATION_END), fr_CA.getDelimiter(LocaleData.ALT_QUOTATION_END)); + assertEquals("Start quotes are not equal", fr_FR.getDelimiter(LocaleData.QUOTATION_START), fr_CH.getDelimiter(LocaleData.QUOTATION_START)); + assertEquals("End quotes are not equals", fr_FR.getDelimiter(LocaleData.QUOTATION_END), fr_CH.getDelimiter(LocaleData.QUOTATION_END)); + assertNotEquals("Alt start quotes are equal", fr_FR.getDelimiter(LocaleData.ALT_QUOTATION_START), fr_CH.getDelimiter(LocaleData.ALT_QUOTATION_START)); + assertNotEquals("Alt end quotes are equals", fr_FR.getDelimiter(LocaleData.ALT_QUOTATION_END), fr_CH.getDelimiter(LocaleData.ALT_QUOTATION_END)); } public void TestLocaleDisplayPattern(){ diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java index 2b6147e0f9f..da3357a74c7 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -2556,8 +2556,8 @@ public class ULocaleTest extends TestFmwk { "fi" }, { "und_FM", - "chk_Latn_FM", - "chk" + "en_Latn_FM", + "en_FM" }, { "und_FO", "fo_Latn_FO", -- 2.40.0