ICU-2720 Java port of fix

X-SVN-Rev: 11150

icu4j/src/com/ibm/icu/dev/test/collator/CollationIteratorTest.java

@@ -216,7 +216,7 @@ public class CollationIteratorTest extends TestFmwk {
      * Return an integer array containing all of the collation orders
      * returned by calls to next on the specified iterator
      */
-    int[] getOrders(CollationElementIterator iter) {
+    static int[] getOrders(CollationElementIterator iter) {
         int maxSize = 100;
         int size = 0;
         int[] orders = new int[maxSize];
@@ -252,8 +252,8 @@ public class CollationIteratorTest extends TestFmwk {
             }
             count += 1;
         } while (c1 != CollationElementIterator.NULLORDER);
-        backAndForth(i1);
-        backAndForth(i2);
+        backAndForth(this, i1);
+        backAndForth(this, i2);
     }
     
     /**
@@ -267,7 +267,7 @@ public class CollationIteratorTest extends TestFmwk {
         CollationElementIterator iter = en_us.getCollationElementIterator(test1);
     
         // A basic test to see if it's working at all
-        backAndForth(iter);
+        backAndForth(this, iter);
     
         // Test with a contracting character sequence
         String source;
@@ -281,7 +281,7 @@ public class CollationIteratorTest extends TestFmwk {
     
         source = "abchdcba";
         iter = c1.getCollationElementIterator(source);
-        backAndForth(iter);
+        backAndForth(this, iter);
     
         // Test with an expanding character sequence
         RuleBasedCollator c2 = null;
@@ -294,7 +294,7 @@ public class CollationIteratorTest extends TestFmwk {
     
         source = "abcd";
         iter = c2.getCollationElementIterator(source);
-        backAndForth(iter);
+        backAndForth(this, iter);
     
         // Now try both
         RuleBasedCollator c3 = null;
@@ -307,7 +307,7 @@ public class CollationIteratorTest extends TestFmwk {
         
         source = "abcdbchdc";
         iter = c3.getCollationElementIterator(source);
-        backAndForth(iter);
+        backAndForth(this, iter);
     
         source= "\u0e41\u0e02\u0e41\u0e02\u0e27abc";
         Collator c4 = null;
@@ -319,7 +319,7 @@ public class CollationIteratorTest extends TestFmwk {
         }
         
         iter = ((RuleBasedCollator)c4).getCollationElementIterator(source);
-        backAndForth(iter);
+        backAndForth(this, iter);
        
         source= "\u0061\u30CF\u3099\u30FC";
         Collator c5 = null;
@@ -330,10 +330,10 @@ public class CollationIteratorTest extends TestFmwk {
         }
         iter = ((RuleBasedCollator)c5).getCollationElementIterator(source);
         
-        backAndForth(iter);
+        backAndForth(this, iter);
     }
     
-    void backAndForth(CollationElementIterator iter) {
+    static void backAndForth(TestFmwk test, CollationElementIterator iter) {
         // Run through the iterator forwards and stick it into an array
         iter.reset();
         int[] orders = getOrders(iter);
@@ -354,7 +354,7 @@ public class CollationIteratorTest extends TestFmwk {
                         index --;
                     } 
                     if (o != orders[index]) {
-                        errln("Mismatch at index " + index + ": 0x" 
+                        test.errln("Mismatch at index " + index + ": 0x" 
                             + Integer.toHexString(orders[index]) + " vs 0x" + Integer.toHexString(o));
                         break;
                     }
@@ -368,21 +368,21 @@ public class CollationIteratorTest extends TestFmwk {
     
         if (index != 0) {
             String msg = "Didn't get back to beginning - index is ";
-            errln(msg + index);
+            test.errln(msg + index);
     
             iter.reset();
-            err("next: ");
+            test.err("next: ");
             while ((o = iter.next()) != CollationElementIterator.NULLORDER) {
                 String hexString = "0x" + Integer.toHexString(o) + " ";
-                err(hexString);
+                test.err(hexString);
             }
-            errln("");
-            err("prev: ");
+            test.errln("");
+            test.err("prev: ");
             while ((o = iter.previous()) != CollationElementIterator.NULLORDER) {
                 String hexString = "0x" + Integer.toHexString(o) + " ";
-                 err(hexString);
+                 test.err(hexString);
             }
-            errln("");
+            test.errln("");
         }
     }
     
@@ -444,7 +444,7 @@ public class CollationIteratorTest extends TestFmwk {
         }
         iter = en_us.getCollationElementIterator(source.toString());
         // A basic test to see if it's working at all 
-        backAndForth(iter);
+        backAndForth(this, iter);
         for (codepoint = 1; codepoint < 0xFFFE;) {
             source.delete(0, source.length());
             while (codepoint % 0xFF != 0) {
@@ -463,7 +463,7 @@ public class CollationIteratorTest extends TestFmwk {
             }
             iter = en_us.getCollationElementIterator(source.toString());
             // A basic test to see if it's working at all 
-            backAndForth(iter);
+            backAndForth(this, iter);
         }
     }
     
@@ -490,7 +490,7 @@ public class CollationIteratorTest extends TestFmwk {
         CollationElementIterator temp 
                         = th_th.getCollationElementIterator(source.toString());
         // A basic test to see if it's working at all 
-        backAndForth(temp);
+        backAndForth(this, temp);
         for (char codepoint = 0x1; codepoint < 0xfffe;) {
             source.delete(0, source.length());
             while (codepoint % 0xFF != 0) {
@@ -510,7 +510,7 @@ public class CollationIteratorTest extends TestFmwk {
             CollationElementIterator iter 
                         = th_th.getCollationElementIterator(source.toString());
             // A basic test to see if it's working at all 
-            backAndForth(iter);
+            backAndForth(this, iter);
         }
     }
     
@@ -580,7 +580,7 @@ public class CollationIteratorTest extends TestFmwk {
                     s = e + 1;
                 }
                 iter.reset();
-                backAndForth(iter);
+                backAndForth(this, iter);
                 count ++;
             }
         }
@@ -614,7 +614,7 @@ public class CollationIteratorTest extends TestFmwk {
         CollationElementIterator iter = coll.getCollationElementIterator("testing");
         for (int count = 0; count < testdata.length; count ++) {
             iter.setText(testdata[count]);
-            backAndForth(iter);
+            backAndForth(this, iter);
         }
     }
 }

icu4j/src/com/ibm/icu/dev/test/collator/CollationThaiTest.java

@@ -159,7 +159,7 @@ public class CollationThaiTest extends TestFmwk {
         }
      
         // Read in a dictionary of Thai words
-               DataInputStream in = null;
+        DataInputStream in = null;
         String fileName = "th18057.txt";
         try {
             in = new DataInputStream(new FileInputStream(TestUtil.getDataFile(
@@ -201,6 +201,12 @@ public class CollationThaiTest extends TestFmwk {
             if (lastWord.length() > 0) {
                 int result = 0;
                 try {
+                    CollationIteratorTest.backAndForth(this, 
+                        ((RuleBasedCollator)coll).getCollationElementIterator(
+                                                                    lastWord));
+                    CollationIteratorTest.backAndForth(this, 
+                        ((RuleBasedCollator)coll).getCollationElementIterator(
+                                                                        word));
                     result = coll.compare(lastWord, word);
                 } catch (Exception e) {
                     logln("line" + line + ":" + word);

icu4j/src/com/ibm/icu/text/CollationElementIterator.java

@@ -654,6 +654,17 @@ public final class CollationElementIterator
         return m_bufferOffset_ > 0;
     }
 
+    /**
+     * Determine if a character is a Thai base consonant which sorts before
+     * its pre-vowel.
+     * @param ch character to test
+     * @return true if ch is a Thai base consonants, false otherwise
+     */
+    static final boolean isThaiBaseConsonant(char ch) 
+    {
+        return ch >= 0xe01 && ch <= 0xe2e;
+    }
+    
     /**
      * Determine if a character is a Thai vowel, which sorts after its base
      * consonant.
@@ -2165,7 +2176,7 @@ public final class CollationElementIterator
     private int previousContraction(RuleBasedCollator collator, int ce, char ch)
     {
         m_utilStringBuffer_.setLength(0);
-        while (collator.isUnsafe(ch)) {
+        while (collator.isUnsafe(ch) || isThaiBaseConsonant(ch)) {
             m_utilStringBuffer_.insert(0, ch);
             ch = previousChar();
             if (isBackwardsStart()) {