From 1bbadfe8356272ed8dc6f2151d3a26ec35e3ecd2 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Tue, 1 Jul 2014 15:41:35 +0000 Subject: [PATCH] ICU-10843 Fixed a collation test failure. It was caused by the lack of LocaleDisplayNamesImpl when the test is executed with a collation module jar. X-SVN-Rev: 35971 --- .../com/ibm/icu/dev/test/collator/CollationServiceTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java index 9458329e0b7..4b1b70a2050 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java @@ -77,7 +77,8 @@ public class CollationServiceTest extends TestFmwk { } try{ String name = Collator.getDisplayName(fu_FU); - if (!"fu (FU, FOO)".equals(name)) { + if (!"fu (FU, FOO)".equals(name) + && !"fu_FU_FOO".equals(name) /* no LocaleDisplayNamesImpl */) { errln("found " + name + " for fu_FU"); } }catch(MissingResourceException ex){ @@ -85,7 +86,8 @@ public class CollationServiceTest extends TestFmwk { } try{ String name = Collator.getDisplayName(fu_FU, fu_FU); - if (!"fu (FU, FOO)".equals(name)) { + if (!"fu (FU, FOO)".equals(name) + && !"fu_FU_FOO".equals(name) /* no LocaleDisplayNamesImpl */) { errln("found " + name + " for fu_FU"); } }catch(MissingResourceException ex){ -- 2.40.0