diff options
Diffstat (limited to 'android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java index 602a5273f..ed57e54a2 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java @@ -301,6 +301,26 @@ public class TimeZoneTest extends CoreTestFmwk "GMT-2:31:123", "0", TimeZone.UNKNOWN_ZONE_ID, "GMT+3:75", "0", TimeZone.UNKNOWN_ZONE_ID, "GMT-01010101", "0", TimeZone.UNKNOWN_ZONE_ID, + "GMT-4E58", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-4e58", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-1E01", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-2E01", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-2e01", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-9e02", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-1e03", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-2e03", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-500M", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-500T", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-9E00", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-0X0F", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-0x0F", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-0x12", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-B111", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-b111", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-0b11", "0", TimeZone.UNKNOWN_ZONE_ID, // ICU-22637 + "GMT-๑๒", "-43200", "GMT-12:00", // ICU-22637 + "GMT-๑๒:๓๔", "-45240", "GMT-12:34", // ICU-22637 + "GMT+๑๒:๓๔:๕๖", "45296", "GMT+12:34:56", // ICU-22637 }; for (int i = 0; i < DATA.length; i += 3) { String id = DATA[i]; @@ -359,25 +379,25 @@ public class TimeZoneTest extends CoreTestFmwk // todo: check to see whether we can test for all of pst, pdt, pt Object[] DATA = { // z and zzzz - Boolean.FALSE, new Integer(TimeZone.SHORT), "PST", - Boolean.TRUE, new Integer(TimeZone.SHORT), "PDT", - Boolean.FALSE, new Integer(TimeZone.LONG), "Pacific Standard Time", - Boolean.TRUE, new Integer(TimeZone.LONG), "Pacific Daylight Time", + Boolean.FALSE, TimeZone.SHORT, "PST", + Boolean.TRUE, TimeZone.SHORT, "PDT", + Boolean.FALSE, TimeZone.LONG, "Pacific Standard Time", + Boolean.TRUE, TimeZone.LONG, "Pacific Daylight Time", // v and vvvv - Boolean.FALSE, new Integer(TimeZone.SHORT_GENERIC), "PT", - Boolean.TRUE, new Integer(TimeZone.SHORT_GENERIC), "PT", - Boolean.FALSE, new Integer(TimeZone.LONG_GENERIC), "Pacific Time", - Boolean.TRUE, new Integer(TimeZone.LONG_GENERIC), "Pacific Time", + Boolean.FALSE, TimeZone.SHORT_GENERIC, "PT", + Boolean.TRUE, TimeZone.SHORT_GENERIC, "PT", + Boolean.FALSE, TimeZone.LONG_GENERIC, "Pacific Time", + Boolean.TRUE, TimeZone.LONG_GENERIC, "Pacific Time", // z and ZZZZ - Boolean.FALSE, new Integer(TimeZone.SHORT_GMT), "-0800", - Boolean.TRUE, new Integer(TimeZone.SHORT_GMT), "-0700", - Boolean.FALSE, new Integer(TimeZone.LONG_GMT), "GMT-08:00", - Boolean.TRUE, new Integer(TimeZone.LONG_GMT), "GMT-07:00", + Boolean.FALSE, TimeZone.SHORT_GMT, "-0800", + Boolean.TRUE, TimeZone.SHORT_GMT, "-0700", + Boolean.FALSE, TimeZone.LONG_GMT, "GMT-08:00", + Boolean.TRUE, TimeZone.LONG_GMT, "GMT-07:00", // V and VVVV - Boolean.FALSE, new Integer(TimeZone.SHORT_COMMONLY_USED), "PST", - Boolean.TRUE, new Integer(TimeZone.SHORT_COMMONLY_USED), "PDT", - Boolean.FALSE, new Integer(TimeZone.GENERIC_LOCATION), "Los Angeles Time", - Boolean.TRUE, new Integer(TimeZone.GENERIC_LOCATION), "Los Angeles Time", + Boolean.FALSE, TimeZone.SHORT_COMMONLY_USED, "PST", + Boolean.TRUE, TimeZone.SHORT_COMMONLY_USED, "PDT", + Boolean.FALSE, TimeZone.GENERIC_LOCATION, "Los Angeles Time", + Boolean.TRUE, TimeZone.GENERIC_LOCATION, "Los Angeles Time", }; for (int i=0; i<DATA.length; i+=3) { @@ -1792,8 +1812,8 @@ public class TimeZoneTest extends CoreTestFmwk */ @Test public void TestDisplayNamesMeta() { - final Integer TZSHORT = new Integer(TimeZone.SHORT); - final Integer TZLONG = new Integer(TimeZone.LONG); + final Integer TZSHORT = TimeZone.SHORT; + final Integer TZLONG = TimeZone.LONG; final Object[][] zoneDisplayTestData = { // zone id locale summer format expected display name |