ICU-9514 final UCA 6.2 UCARules.txt, adjust test code

X-SVN-Rev: 32417

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 28f3084f147da6890a697800d0343cbc1d30f9bc..bf0708a71ad930fa9bed44628f78c4cf7d094786 100755 (executable)
--- 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:d94ab198a3763dacb91ef2b5f84cb33120aecc272c18b6bff7743928d454aaa5
-size 9826469
+oid sha256:4903fee1c53acfb58169eaf8d28155ab8adbd4f87091fbd19f74b33b2ddca7eb
+size 9826495

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java
index 7567beb1ea42c418a3a968c6f6f0d250ff46cc31..0f64cc8c7b5bd01227dcef50db6de4b928132800 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/UCAConformanceTest.java
@@ -198,8 +198,8 @@ public class UCAConformanceTest extends TestFmwk {
         if((flags & FROM_RULES) != 0 && 0xac00 <= (c = s.charAt(0)) && c <= 0xd7a3) {
             return true;
         }
-        // TODO: Fix UCARules.txt.
-        if((flags & FROM_RULES) != 0 && s.length() >= 2 && 0xec0 <= (c = s.charAt(0)) && c <= 0xec4) {
+        // TODO: Fix tailoring builder, ICU ticket #9593.
+        if((flags & FROM_RULES) != 0 && s.length() >= 2 && ((c = s.charAt(1)) == 0xedc || c == 0xedd)) {
             return true;
         }
         return false;