AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5970 Merging tzdata 2007k into ICU4J trunk, with one necessary test data update. Also fixed a test code bug in DateFormatTest revealed by the Argentina test data update included in 2007k.

Browse Source 
X-SVN-Rev: 23152
This commit is contained in:
Yoshito Umaoka 2008-01-02 20:45:51 +00:00
parent 8a5b6a411b
commit e221b8c263
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4j/src/com/ibm/icu/dev/data/testdata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c28be56bcd6319df946343677e44963ddc5d54f67d48da4c5fa0261c99a3881
size 750568
oid sha256:ce0471bcab609e7456ff8eb1a6b54ba40450ee290d444ad2960554369e049b53
size 747570

16
icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java
View File

@ -1,7 +1,7 @@
//##header J2SE15
/*
*******************************************************************************
* Copyright (C) 2001-2007, International Business Machines Corporation and *
* Copyright (C) 2001-2008, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -497,18 +497,22 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
public void TestTimeZoneDisplayName() {
Calendar cal = new GregorianCalendar();
long julyDate = new Date(2004, 6, 15).getTime();
long januaryDate = new Date(2004, 0, 15).getTime();
SimpleDateFormat testfmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
for (int i = 0; i < fallbackTests.length; ++i) {
String[] info = fallbackTests[i];
logln(info[0] + ";" + info[1] + ";" + info[2] + ";" + info[3]);
long time = 0;
try {
Date testd = testfmt.parse(info[2]);
time = testd.getTime();
} catch (ParseException pe) {
errln("Failed to parse test date data");
continue;
}
ULocale l = new ULocale(info[0]);
TimeZone tz = TimeZone.getTimeZone(info[1]);
long time = info[2].equals("2004-07-15T00:00:00Z")
? julyDate
: januaryDate;
SimpleDateFormat fmt = new SimpleDateFormat(info[3], l);
cal.setTimeInMillis(time);
cal.setTimeZone(tz);

4
icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View File

@ -1,6 +1,6 @@
/**
*******************************************************************************
* Copyright (C) 2000-2007, International Business Machines Corporation and *
* Copyright (C) 2000-2008, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -118,7 +118,7 @@ public class TimeZoneTest extends TestFmwk
new ZoneDescriptor("EST", -300, false),// updated Aug 2003 aliu
new ZoneDescriptor("PRT", -240, false),
new ZoneDescriptor("CNT", -210, true),
new ZoneDescriptor("AGT", -180, false),
new ZoneDescriptor("AGT", -180, true), // updated by tzdata 2007k
new ZoneDescriptor("BET", -180, true),
// new ZoneDescriptor("CAT", -60, false), // Wrong:
// As of bug 4130885, fix CAT (Central Africa)

4
icu4j/src/com/ibm/icu/impl/data/icudata.jar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65efc54cd4834fa6364b0d431fc6db017a4d53163ca3e99b998a85b6d86130c6
size 5412228
oid sha256:6ad6bf1563a66928932551bc740d6f7401e80423e564705a4575d90b484c3a9c
size 5412337