ICU-9774 FilteredNormalizer2: CharSequence.subSequence(start, limit) limit must be...

X-SVN-Rev: 32911

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/FilteredNormalizer2.java b/icu4j/main/classes/core/src/com/ibm/icu/text/FilteredNormalizer2.java
index b5ee32d6cb934e18b683b9351e96dd7ae7594b0b..dea4e60b87b27d81277f6721e50c5992b55d8dc6 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/FilteredNormalizer2.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/FilteredNormalizer2.java
@@ -277,7 +277,8 @@ public class FilteredNormalizer2 extends Normalizer2 {
                     norm2.append(first, prefix);
                 }
             } else {
-                StringBuilder middle=new StringBuilder(first.subSequence(suffixStart, 0x7fffffff));
+                StringBuilder middle=new StringBuilder(
+                        first.subSequence(suffixStart, first.length()));
                 if(doNormalize) {
                     norm2.normalizeSecondAndAppend(middle, prefix);
                 } else {
@@ -287,7 +288,7 @@ public class FilteredNormalizer2 extends Normalizer2 {
             }
         }
         if(prefixLimit<second.length()) {
-            CharSequence rest=second.subSequence(prefixLimit, 0x7fffffff);
+            CharSequence rest=second.subSequence(prefixLimit, second.length());
             if(doNormalize) {
                 normalize(rest, first, UnicodeSet.SpanCondition.NOT_CONTAINED);
             } else {

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/BasicTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/BasicTest.java
index 7718c0b67e8e4eb151ea368d1658c85088099248..fa300046d027dd52695b12f585f107b36c41a3fb 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/BasicTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/normalizer/BasicTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 1996-2011, International Business Machines Corporation and
+ * Copyright (C) 1996-2012, International Business Machines Corporation and
  * others. All Rights Reserved.
  *******************************************************************************
  */
@@ -2651,6 +2651,26 @@ public class BasicTest extends TestFmwk {
         }
     }
 
+    public void TestFilteredAppend() {
+        Normalizer2 nfcNorm2=Normalizer2.getNFCInstance();
+        UnicodeSet filter=new UnicodeSet("[^\u00a0-\u00ff\u0310-\u031f]");
+        FilteredNormalizer2 fn2=new FilteredNormalizer2(nfcNorm2, filter);
+
+        // Append two strings that each contain a character outside the filter set.
+        StringBuilder sb = new StringBuilder("a\u0313a");
+        String second = "\u0301\u0313";
+        assertEquals("append()", "a\u0313á\u0313", fn2.append(sb, second).toString());
+
+        // Same, and also normalize the second string.
+        sb.replace(0, 0x7fffffff, "a\u0313a");
+        assertEquals(
+            "normalizeSecondAndAppend()",
+            "a\u0313á\u0313", fn2.normalizeSecondAndAppend(sb, second).toString());
+        
+        // Normalizer2.normalize(String) uses spanQuickCheckYes() and normalizeSecondAndAppend().
+        assertEquals("normalize()", "a\u0313á\u0313", fn2.normalize("a\u0313a\u0301\u0313"));
+    }
+
     public void TestGetEasyToUseInstance() {
         // Test input string:
         // U+00A0 -> <noBreak> 0020