organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-7194 Update ICU4J version to 4.3.3

Browse source 
X-SVN-Rev: 26853
This commit is contained in:
Yoshito Umaoka 2009-11-06 06:33:24 +00:00
parent 62ed917dd8
commit af6765a0a1
7 changed files with 17 additions and 19 deletions
icu4j
build.properties
main
classes/core/src/com/ibm/icu/util
VersionInfo.java
shared/build
common.properties
tests
charset/src/com/ibm/icu/dev/test/charset
TestConversion.java
core/src/com/ibm/icu/dev/test
format
DateTimeGeneratorTest.java
timezone
TimeZoneRuleTest.java
translit/src/com/ibm/icu/dev/test/translit
RoundTripTest.java

2
icu4j/build.properties
View file

@ -2,5 +2,5 @@
#* Copyright (C) 2009, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
api.report.version = 432
api.report.version = 433
api.report.prev.version = 421

4
icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
View file

@ -459,8 +459,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
UNICODE_4_1 = getInstance(4, 1, 0, 0);
UNICODE_5_0 = getInstance(5, 0, 0, 0);
UNICODE_5_1 = getInstance(5, 1, 0, 0);
ICU_VERSION = getInstance(4, 3, 2, 0);
ICU_DATA_VERSION = getInstance(4, 3, 2, 0);
ICU_VERSION = getInstance(4, 3, 3, 0);
ICU_DATA_VERSION = getInstance(4, 3, 3, 0);
UCOL_RUNTIME_VERSION = getInstance(6);
UCOL_BUILDER_VERSION = getInstance(7);
UCOL_TAILORINGS_VERSION = getInstance(1);

4
icu4j/main/shared/build/common.properties
View file

@ -4,8 +4,8 @@
#*******************************************************************************
# Version numbers, etc.
icu4j.spec.version = 4.3.2
icu4j.impl.version = 4.3.2
icu4j.spec.version = 4.3.3
icu4j.impl.version = 4.3.3
current.year = 2009
corp = IBM Corporation

8
icu4j/main/tests/charset/src/com/ibm/icu/dev/test/charset/TestConversion.java
View file

@ -214,7 +214,7 @@ public class TestConversion extends ModuleTest {
}
} catch (Exception e) {
if (skipIfBeforeICU(4,3,2)) { // TIME BOMB
if (skipIfBeforeICU(4,3,3)) { // TIME BOMB
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
} else {
errln(cc.charset + " was not found");
@ -496,7 +496,7 @@ public class TestConversion extends ModuleTest {
} catch (Exception e) {
// TODO implement loading of test data.
if (skipIfBeforeICU(4,3,2)) {
if (skipIfBeforeICU(4,3,3)) {
logln("Skipping test:(" + cc.charset + ") due to ICU Charset not supported at this time");
} else {
errln(cc.charset + " was not found");
@ -1096,7 +1096,7 @@ public class TestConversion extends ModuleTest {
// test to see if the conversion matches actual results
if (output.limit() != expected.length()) {
if (skipIfBeforeICU(4,3,2)) { // TIME BOMB
if (skipIfBeforeICU(4,3,3)) { // TIME BOMB
logln("Skipping test:(" + cc.charset + ") due to time bomb");
} else {
errln("Test failed: output length does not match expected for charset: "+cc.charset+ " [" + cc.caseNr + "]");
@ -1120,7 +1120,7 @@ public class TestConversion extends ModuleTest {
logln("Expected: " + printchars(CharBuffer.wrap(expected), expected.length()));
logln("Passed");
}
else if (skipIfBeforeICU(4,3,2)) {
else if (skipIfBeforeICU(4,3,3)) {
// TIME BOMB
} else {
errln("[" + cc.caseNr + "]:" + cc.charset);

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
View file

@ -427,7 +427,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(4,3,2)) {
if (skipIfBeforeICU(4,3,3)) { // ticket#6806
logln(showOrderComparison(uLocale, style1, style2, order1, order2));
} else {
errln(showOrderComparison(uLocale, style1, style2, order1, order2));

6
icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneRuleTest.java
View file

@ -436,8 +436,7 @@ public class TimeZoneRuleTest extends TestFmwk {
String[] tzids = getTestZIDs();
for (int i = 0; i < tzids.length; i++) {
if (skipIfBeforeICU(4,3,2) && tzids[i].equals("Asia/Amman")) {
// See #7008
if (skipIfBeforeICU(4,5,0) && tzids[i].equals("Asia/Amman")) { // ticket#7008
continue;
}
BasicTimeZone olsontz = (BasicTimeZone)TimeZone.getTimeZone(tzids[i], TimeZone.TIMEZONE_ICU);
@ -514,8 +513,7 @@ public class TimeZoneRuleTest extends TestFmwk {
for (int n = 0; n < startTimes.length; n++) {
long startTime = startTimes[n];
for (int i = 0; i < tzids.length; i++) {
if (skipIfBeforeICU(4,3,2) && tzids[i].equals("Asia/Amman")) {
// See #7008
if (skipIfBeforeICU(4,3,2) && tzids[i].equals("Asia/Amman")) { // ticket#7008
continue;
}
BasicTimeZone olsontz = (BasicTimeZone)TimeZone.getTimeZone(tzids[i], TimeZone.TIMEZONE_ICU);

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

@ -322,7 +322,7 @@ public class RoundTripTest extends TestFmwk {
String getGreekSet() {
// Time bomb
if (skipIfBeforeICU(4,3,2)) {
if (skipIfBeforeICU(4,3,3)) {
// 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");
@ -384,7 +384,7 @@ public class RoundTripTest extends TestFmwk {
public void TestHebrew() throws IOException {
// Time bomb
if (skipIfBeforeICU(4,3,2)) {
if (skipIfBeforeICU(4,3,3)) {
// 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");
@ -399,7 +399,7 @@ public class RoundTripTest extends TestFmwk {
public void TestThai() throws IOException {
long start = System.currentTimeMillis();
if(skipIfBeforeICU(4,3,2)){
if(skipIfBeforeICU(4,3,3)){
new Test("Latin-Thai")
.test("[a-zA-Z\u0142\u1ECD\u00E6\u0131\u0268\u02CC]",
"[\u0E01-\u0E3A\u0E40-\u0E5B]",
@ -481,7 +481,7 @@ public class RoundTripTest extends TestFmwk {
public void TestDevanagariLatin() throws IOException {
long start = System.currentTimeMillis();
if (skipIfBeforeICU(4,3,2)) {
if (skipIfBeforeICU(4,3,3)) {
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
@ -854,7 +854,7 @@ public class RoundTripTest extends TestFmwk {
logln("Testing only 5 of "+ interIndicArray.length+" Skipping rest (use -e for exhaustive)");
num = 5;
}
if (skipIfBeforeICU(4,3,2)) {
if (skipIfBeforeICU(4,3,3)) {
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