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

ICU-6098 Update ICU4J version to 4.0. Update ICU4J data version to 40. Also bump timebombed test cases.

Browse Source 
X-SVN-Rev: 23935
This commit is contained in:
Yoshito Umaoka 2008-05-19 21:33:02 +00:00
parent 90c5643557
commit f9dc77a7a3
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu4j/build.properties
View File

@ -7,17 +7,17 @@
#*
# spec version won't be changed in a feature stream
icu4j.spec.version.string=3.9
icu4j.spec.version.string=4.0
# impl version will be updated for maintenance releases.
# It must be <icu4j.spec.version.string>[.<maint-version>]
icu4j.impl.version.string=3.9.3
icu4j.impl.version.string=4.0
# data version number won't be changed in a feature stream
icu4j.data.version.number=39
icu4j.data.version.number=40
# these version numbers are used by API change report
icu4j.version.number=393
icu4j.version.number=400
icu4j.previous.version.number=381
current.year=2008
@ -26,5 +26,5 @@ copyright=Copyright (c) 2000-2008, International Business Machines Corporation a
corp=IBM Corporation
default.target.rt.version=J2SE15
icu4j.plugin.impl.version.string=3.9.3
icu4j.plugin.impl.version.string=4.0.0
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2008. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.

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:c0bec44418206964c6b50a1ad38693dbc05b3f0e62f4f2830ff8990d8f49e951
size 752780
oid sha256:e3966115ee3908b48df544d9f629bc8bcc62b7a30ee581f13b247d03ef0e50bb
size 762687

4
icu4j/src/com/ibm/icu/dev/test/charset/TestConversion.java
View File

@ -214,7 +214,7 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
// TODO implement loading of test data.
if (skipIfBeforeICU(3,9,3)) {
if (skipIfBeforeICU(4,0,0)) {
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
} else {
errln(cc.charset + " was not found");
@ -498,7 +498,7 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
// TODO implement loading of test data.
if (skipIfBeforeICU(3,9,3)) {
if (skipIfBeforeICU(4,0,0)) {
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
} else {
errln(cc.charset + " was not found");

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

@ -213,7 +213,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,9,3)&& uLocale.equals("zh_Hans_CN") && testSkeleton.equals("HHmm")){
if(skipIfBeforeICU(4,0,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;
}
@ -392,7 +392,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,9,3)) {
if (skipIfBeforeICU(4,0,0)) {
logln(showOrderComparison(uLocale, style1, style2, order1, order2));
} else {
errln(showOrderComparison(uLocale, style1, style2, order1, order2));

10
icu4j/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,9,3)) {
if (skipIfBeforeICU(4,0,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,9,3)) {
if (skipIfBeforeICU(4,0,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,9,3)){
if(skipIfBeforeICU(4,0,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,9,3)) {
if (skipIfBeforeICU(4,0,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,9,3)) {
if (skipIfBeforeICU(4,0,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
icu4j/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
View File

@ -5,7 +5,7 @@
package com.ibm.icu.dev.test.util;
public class DebugUtilitiesData extends Object {
public static final String ICU4C_VERSION="3.9.3";
public static final String ICU4C_VERSION="4.0";
public static final int UDebugEnumType = 0;
public static final int UCalendarDateFields = 1;
public static final int UCalendarMonths = 2;

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:812eee57ed42224e59ee9601ef85824348dfa31ab698c6686c2cf6aa8fc97257
size 6269380
oid sha256:0327aa4865df37337bbe410756865dae9947e637ec0e309dd8747cb837e2caee
size 6376639

2
icu4j/src/com/ibm/icu/text/Bidi.java
View File

@ -1,4 +1,4 @@
//##header J2SE14
//##header J2SE15
/*
*******************************************************************************
* Copyright (C) 2001-2008, International Business Machines

4
icu4j/src/com/ibm/icu/util/VersionInfo.java
View File

@ -124,7 +124,7 @@ public final class VersionInfo
* @internal
* @deprecated This API is ICU internal only.
*/
public static final String ICU_DATA_VERSION = "39b";
public static final String ICU_DATA_VERSION = "40b";
/**
* ICU4J collator runtime version
@ -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, 9, 3, 0);
ICU_VERSION = getInstance(4, 0, 0, 0);
UCOL_RUNTIME_VERSION = getInstance(6);
UCOL_BUILDER_VERSION = getInstance(7);
UCOL_TAILORINGS_VERSION = getInstance(1);