From 339f14fbd6be16ee488333450e7c88398a76157f Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 26 Sep 2014 20:09:51 +0000 Subject: [PATCH] ICU-10898 tzdata2014h updates in ICU4J X-SVN-Rev: 36593 --- icu4j/main/shared/data/icutzdata.jar | 4 +-- .../icu/dev/test/timezone/TimeZoneTest.java | 27 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 3b94cc0ee2..6fb1875437 100755 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc5346d320ae6ef1520ed6d5491df38a552bd1c23a88dc141e3c4d142a06aed8 -size 90808 +oid sha256:f58b8b830db226d44f8c2b9605079fc9aaf9b811850ab9cef1d629adced5ce21 +size 90610 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 37e84ca800..91cabc4e64 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1476,23 +1476,32 @@ public class TimeZoneTest extends TestFmwk // in Olson tzdata. final String[][] excluded1 = { {"Africa/Bamako", "Africa/Abidjan"}, + {"Africa/Bangui", "Africa/Lagos"}, {"Africa/Banjul", "Africa/Abidjan"}, - {"Africa/Brazzaville", "Africa/Bangui"}, + {"Africa/Blantyre", "Africa/Maputo"}, + {"Africa/Brazzaville", "Africa/Lagos"}, + {"Africa/Bujumbura", "Africa/Maputo"}, {"Africa/Conakry", "Africa/Abidjan"}, {"Africa/Dakar", "Africa/Abidjan"}, - {"Africa/Douala", "Africa/Bangui"}, + {"Africa/Douala", "Africa/Lagos"}, {"Africa/Freetown", "Africa/Abidjan"}, + {"Africa/Gaborone", "Africa/Maputo"}, + {"Africa/Harare", "Africa/Maputo"}, {"Africa/Khartoum", "Africa/Juba"}, - {"Africa/Kinshasa", "Africa/Bangui"}, - {"Africa/Lagos", "Africa/Bangui"}, - {"Africa/Libreville", "Africa/Bangui"}, + {"Africa/Kigali", "Africa/Maputo"}, + {"Africa/Kinshasa", "Africa/Lagos"}, + {"Africa/Libreville", "Africa/Lagos"}, {"Africa/Lome", "Africa/Abidjan"}, - {"Africa/Luanda", "Africa/Bangui"}, - {"Africa/Malabo", "Africa/Bangui"}, - {"Africa/Niamey", "Africa/Bangui"}, + {"Africa/Luanda", "Africa/Lagos"}, + {"Africa/Lubumbashi", "Africa/Maputo"}, + {"Africa/Lusaka", "Africa/Maputo"}, + {"Africa/Maseru", "Africa/Johannesburg"}, + {"Africa/Malabo", "Africa/Lagos"}, + {"Africa/Mbabane", "Africa/Johannesburg"}, + {"Africa/Niamey", "Africa/Lagos"}, {"Africa/Nouakchott", "Africa/Abidjan"}, {"Africa/Ouagadougou", "Africa/Abidjan"}, - {"Africa/Porto-Novo", "Africa/Bangui"}, + {"Africa/Porto-Novo", "Africa/Lagos"}, {"Africa/Sao_Tome", "Africa/Abidjan"}, {"America/Curacao", "America/Aruba"}, {"America/Dominica", "America/Anguilla"},