From cf004a4691e18ac4c35b4e79c08b3e86695d96f1 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 23 Dec 2013 06:43:34 +0000 Subject: [PATCH] ICU-10609 Fix test failures only found in clean build, missed in incremental build, J X-SVN-Rev: 34817 --- icu4j/main/shared/data/icudata.jar | 4 ++-- icu4j/main/shared/data/icutzdata.jar | 2 +- .../com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java | 2 +- .../src/com/ibm/icu/dev/test/format/NumberFormatTest.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 5c1f93ced9c..965ee17b528 100755 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b22b65e62f0731a9e504ebc802eca2565a6495832d237ae1c5eb041f8998d054 -size 10994843 +oid sha256:6bf357741f8329f8f94ca4a80e8c9ce56303ebe5ef980d1fe91bcccf69701d90 +size 10996258 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index f9b2e3facc7..cd7a22d3fc4 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:4e68e85b4b420bf3452586480b8683368821b129b1c3b99a1ca41afb2c2ade6b +oid sha256:73f64fdcce5632f238ef2f48a18dc8ce92ae9498b8f9af67c618d9302f24b034 size 97708 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index 39da5d0e034..608702bc6bc 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -449,7 +449,7 @@ public class DateTimeGeneratorTest extends TestFmwk { new String[] {"MMMd", "13 \u044F\u043D\u0432."}, new String[] {"MMMMd", "13 \u044F\u043D\u0432\u0430\u0440\u044F"}, new String[] {"yQQQ", "1-\u0439 \u043A\u0432. 1999 \u0433."}, - new String[] {"hhmm", "11:58 \u043F\u043E\u0441\u043B\u0435 \u043F\u043E\u043B\u0443\u0434\u043D\u044F"}, + new String[] {"hhmm", "11:58 PM"}, new String[] {"HHmm", "23:58"}, new String[] {"jjmm", "23:58"}, new String[] {"mmss", "58:59"}, diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java index 598c5f6588f..c3111d25ef6 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java @@ -3131,8 +3131,8 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk { String[] DATA = { "es", "CO", "", "1.250,75", "es", "CR", "", "1.250,75", - "es", "ES", "", "1\u00A0250,75", - "es", "GQ", "", "1\u00A0250,75", + "es", "ES", "", "1.250,75", + "es", "GQ", "", "1.250,75", "es", "MX", "", "1,250.75", "es", "US", "", "1,250.75", "es", "VE", "", "1.250,75",