organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6042 Updated the ICU4J version number to 3.8.1. Also updated timebombs in some test cases. Re-enabled DateFormatRoundTripTest with a required change.

Browse source 
X-SVN-Rev: 22998
This commit is contained in:
Yoshito Umaoka 2007-11-30 22:07:22 +00:00
parent c492e65814
commit ff3035f27f
12 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build.properties
View file

@ -6,14 +6,19 @@
#* This is the properties file for ICU4J builds.
#*
# spec version won't be changed in feature stream
# spec version won't be changed in a feature stream
icu4j.spec.version.string=3.8
# impl version will be updated for maintenance releases.
# It must be <icu4j.spec.version.string>[.<maint-version>]
icu4j.impl.version.string=3.8
icu4j.impl.version.string=3.8.1
icu4j.version.number=38
# data version number won't be changed in a feature stream
icu4j.data.version.number=38
# these version numbers are used by API change report
# and eclipse plug-ins.
icu4j.version.number=381
icu4j.previous.version.number=36
current.year=2007
@ -22,5 +27,5 @@ copyright=Copyright (c) 2000-2007, International Business Machines Corporation a
corp=IBM Corporation
default.target.rt.version=J2SE15
icu4j.plugin.impl.version.string=3.8.0
icu4j.plugin.impl.version.string=3.8.1
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2007. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.

2
build.xml
View file

@ -108,7 +108,7 @@
<property file="build.properties" />
<!-- fix the data folder every time there is a version update-->
<property name="icu4j.data.path" value="com/ibm/icu/impl/data/icudt${icu4j.version.number}b" />
<property name="icu4j.data.path" value="com/ibm/icu/impl/data/icudt${icu4j.data.version.number}b" />
<property name="icu4j.testdata.path" value="com/ibm/icu/dev/data/testdata" />
<property name="icu4j.javac.source" value="1.3" />
<property name="icu4j.javac.target" value="1.3" />

2
src/com/ibm/icu/dev/test/calendar/ChineseTest.java
View file

@ -176,7 +176,7 @@ public class ChineseTest extends CalendarTest {
tempcal.clear();
tempcal.set(1989, Calendar.NOVEMBER, 1);
ChineseCalendar chinese = new ChineseCalendar();
if (!skipIfBeforeICU(3,8,0)) {
if (!skipIfBeforeICU(3,9,0)) {
doLimitsTest(chinese, null, tempcal.getTime());
}
doTheoreticalLimitsTest(chinese, true);

2
src/com/ibm/icu/dev/test/calendar/CopticTest.java
View file

@ -194,7 +194,7 @@ public class CopticTest extends CalendarTest
Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 1);
CopticCalendar coptic = new CopticCalendar();
if (!skipIfBeforeICU(3,8,0)) {
if (!skipIfBeforeICU(3,9,0)) {
doLimitsTest(coptic, null, cal.getTime());
}
doTheoreticalLimitsTest(coptic, true);

2
src/com/ibm/icu/dev/test/calendar/EthiopicTest.java
View file

@ -225,7 +225,7 @@ public class EthiopicTest extends CalendarTest
Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 1);
EthiopicCalendar ethiopic = new EthiopicCalendar();
if (!skipIfBeforeICU(3,8,0)) {
if (!skipIfBeforeICU(3,9,0)) {
doLimitsTest(ethiopic, null, cal.getTime());
}
doTheoreticalLimitsTest(ethiopic, true);

4
src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java
View file

@ -296,7 +296,7 @@ public class IBMCalendarTest extends CalendarTest {
Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 1);
BuddhistCalendar buddhist = new BuddhistCalendar();
if (!skipIfBeforeICU(3,8,0)) {
if (!skipIfBeforeICU(3,9,0)) {
doLimitsTest(buddhist, null, cal.getTime());
}
doTheoreticalLimitsTest(buddhist, false);
@ -325,7 +325,7 @@ public class IBMCalendarTest extends CalendarTest {
Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 1);
TaiwanCalendar taiwan = new TaiwanCalendar();
if (!skipIfBeforeICU(3,8,0)) {
if (!skipIfBeforeICU(3,9,0)) {
doLimitsTest(taiwan, null, cal.getTime());
}
doTheoreticalLimitsTest(taiwan, false);

2
src/com/ibm/icu/dev/test/calendar/IndianTest.java
View file

@ -237,7 +237,7 @@ public class IndianTest extends CalendarTest
Calendar cal = Calendar.getInstance();
cal.set(2007, Calendar.JANUARY, 1);
IndianCalendar indian = new IndianCalendar();
if (!skipIfBeforeICU(3,8,0)) {
if (!skipIfBeforeICU(3,9,0)) {
doLimitsTest(indian, null, cal.getTime());
}
doTheoreticalLimitsTest(indian, true);

6
src/com/ibm/icu/dev/test/charset/TestConversion.java
View file

@ -205,7 +205,7 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
// TODO implement loading of test data.
if (skipIfBeforeICU(3,8,0)) {
if (skipIfBeforeICU(3,9,0)) {
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
} else {
errln(cc.charset + " was not found");
@ -425,7 +425,7 @@ public class TestConversion extends ModuleTest {
// decoder replacement
// { "ibm-1363", :bin{ a2aea2 }, "\u00a1\u001a", :intvector{ 0, 2 },
// :int{1}, :int{0}, "", "?", :bin{""} }
if (cc.caseNr == 63 && skipIfBeforeICU(3,8,0)) {
if (cc.caseNr == 63 && skipIfBeforeICU(3,9,0)) {
logln("TestToUnicode[" + cc.caseNr + "] " + cc.charset);
logln("Skipping test due to limitation in Java API - callback replacement value");
return;
@ -489,7 +489,7 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
// TODO implement loading of test data.
if (skipIfBeforeICU(3,8,0)) {
if (skipIfBeforeICU(3,9,0)) {
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
} else {
errln(cc.charset + " was not found");

14
src/com/ibm/icu/dev/test/format/DateFormatRoundTripTest.java
View file

@ -38,12 +38,6 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
}
public void TestDateFormatRoundTrip() {
if (skipIfBeforeICU(3,8,1)) {
// This test case is currently broken because of TimeZone formatting spec changes.
// After all of TimeZone formatting/parsing problems are resolved, we should revisit
// this test case and make necessary changes. 2007-10-01 yoshito
return;
}
dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss.SSS zzz yyyy G");
getFieldCal = Calendar.getInstance();
ran = createRandom(); // use test framework's random seed
@ -156,8 +150,7 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
// patterns we have, but it may be a problem later.
boolean hasEra = (pat.indexOf("G") != -1);
boolean hasZone = (pat.indexOf("Z") != -1) || (pat.indexOf("z") != -1)
|| (pat.indexOf("v") != -1) || (pat.indexOf("V") != -1);
boolean hasZoneDisplayName = (pat.indexOf("z") != -1) || (pat.indexOf("v") != -1) || (pat.indexOf("V") != -1);
// Because patterns contain incomplete data representing the Date,
// we must be careful of how we do the roundtrip. We start with
@ -228,7 +221,10 @@ public class DateFormatRoundTripTest extends com.ibm.icu.dev.test.TestFmwk {
maxDmatch = 3;
maxSmatch = 2;
}
if (hasZone && (fmt.getTimeZone().inDaylightTime(d[0]) || fmt.getTimeZone().inDaylightTime(d[1]) )) {
if (hasZoneDisplayName &&
(fmt.getTimeZone().inDaylightTime(d[0])
|| fmt.getTimeZone().inDaylightTime(d[1])
|| d[0].getTime() < 0L /* before 1970 */)) {
maxSmatch = 2;
if (timeOnly) {
maxDmatch = 3;

4
src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
View file

@ -179,7 +179,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
if (GENERATE_TEST_DATA) {
logln("new String[] {\"" + testSkeleton + "\", \"" + Utility.escape(formatted) + "\"},");
} else if (!formatted.equals(testFormatted)) {
if(skipIfBeforeICU(3,8,0)&& uLocale.equals("zh_Hans_CN") && testSkeleton.equals("HHmm")){
if(skipIfBeforeICU(3,9,0)&& uLocale.equals("zh_Hans_CN") && testSkeleton.equals("HHmm")){
logln(uLocale + "\tformatted string doesn't match test case: " + testSkeleton + "\t generated: " + pattern + "\t expected: " + testFormatted + "\t got: " + formatted);
continue;
}
@ -312,7 +312,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
DateOrder order2 = getOrdering(style2, uLocale);
if (!order1.hasSameOrderAs(order2)) {
if (order1.monthLength == order2.monthLength) { // error if have same month length, different ordering
if (skipIfBeforeICU(3,8,1)) {
if (skipIfBeforeICU(3,9,0)) {
logln(showOrderComparison(uLocale, style1, style2, order1, order2));
} else {
errln(showOrderComparison(uLocale, style1, style2, order1, order2));

10
src/com/ibm/icu/dev/test/translit/RoundTripTest.java
View file

@ -206,7 +206,7 @@ public class RoundTripTest extends TestFmwk {
String getGreekSet() {
// Time bomb
if (skipIfBeforeICU(3,8,0)) {
if (skipIfBeforeICU(3,9,0)) {
// We temporarily filter against Unicode 4.1, but we only do this
// before version 3.5.
logln("TestGreek needs to be updated to remove delete the section marked [:Age=4.0:] filter");
@ -268,7 +268,7 @@ public class RoundTripTest extends TestFmwk {
public void TestHebrew() throws IOException {
// Time bomb
if (skipIfBeforeICU(3,8,0)) {
if (skipIfBeforeICU(3,9,0)) {
// We temporarily filter against Unicode 4.1, but we only do this
// before version 3.5.
logln("TestHebrew needs to be updated to remove delete the section marked [:Age=4.0:] filter");
@ -283,7 +283,7 @@ public class RoundTripTest extends TestFmwk {
public void TestThai() throws IOException {
long start = System.currentTimeMillis();
if(skipIfBeforeICU(3,8,0)){
if(skipIfBeforeICU(3,9,0)){
new Test("Latin-Thai")
.test("[a-zA-Z\u0142\u1ECD\u00E6\u0131\u0268\u02CC]",
"[\u0E01-\u0E3A\u0E40-\u0E5B]",
@ -370,7 +370,7 @@ public class RoundTripTest extends TestFmwk {
.test(latinForIndic, "[[:Devanagari:][\u094d][\u0964\u0965] & [:Age=3.2:]]", "[\u0965]", this, new LegalIndic());
}else{
if (skipIfBeforeICU(3,8,0)) {
if (skipIfBeforeICU(3,9,0)) {
logln("Warning: TestDevanagariLatin needs to be updated to remove delete the section marked [:Age=4.1:] filter");
} else {
// We temporarily filter against Unicode 4.1, but we only do this
@ -744,7 +744,7 @@ public class RoundTripTest extends TestFmwk {
logln("Testing only 5 of "+ interIndicArray.length+" Skipping rest (use -e for exhaustive)");
num = 5;
}
if (skipIfBeforeICU(3,8,0)) {
if (skipIfBeforeICU(3,9,0)) {
logln("Warning: TestInterIndic needs to be updated to remove delete the section marked [:Age=4.1:] filter");
} else {
// We temporarily filter against Unicode 4.1, but we only do this

2
src/com/ibm/icu/util/VersionInfo.java
View file

@ -445,7 +445,7 @@ public final class VersionInfo
UNICODE_4_0_1 = getInstance(4, 0, 1, 0);
UNICODE_4_1 = getInstance(4, 1, 0, 0);
UNICODE_5_0 = getInstance(4, 1, 0, 0);
ICU_VERSION = getInstance(3, 8, 0, 0);
ICU_VERSION = getInstance(3, 8, 1, 0);
UCOL_RUNTIME_VERSION = getInstance(6);
UCOL_BUILDER_VERSION = getInstance(7);
UCOL_TAILORINGS_VERSION = getInstance(1);