From: Shane Carr <shane@unicode.org>
Date: Wed, 16 May 2018 21:57:48 +0000 (+0000)
Subject: ICU-13629 One more attempt at fixing the flaky UCharacterCaseTest.
X-Git-Tag: release-62-rc~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bebf3c09833e941f3a8cc6af272dcbfb9fd09068;p=icu

ICU-13629 One more attempt at fixing the flaky UCharacterCaseTest.

X-SVN-Rev: 41388
---

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java
index cd3ac5539d7..7ee1f55c5a4 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCaseTest.java
@@ -1397,28 +1397,31 @@ public final class UCharacterCaseTest extends TestFmwk
         // Demonstrate the iterator next() method:
         Edits.Iterator fineIterator = edits.getFineIterator();
         int i = 0;
-        int toStringOffset = fineIterator.toString().indexOf('{');
         while (fineIterator.next()) {
             String expected = fineIteratorExpected[i++];
-            assertEquals("Iteration #" + i, expected, fineIterator.toString().substring(toStringOffset));
+            String actual = fineIterator.toString();
+            assertEquals("Iteration #" + i, expected, actual.substring(actual.length() - expected.length()));
         }
         Edits.Iterator fineChangesIterator = edits.getFineChangesIterator();
         i = 0;
         while (fineChangesIterator.next()) {
             String expected = fineChangesIteratorExpected[i++];
-            assertEquals("Iteration #" + i, expected, fineChangesIterator.toString().substring(toStringOffset));
+            String actual = fineChangesIterator.toString();
+            assertEquals("Iteration #" + i, expected, actual.substring(actual.length() - expected.length()));
         }
         Edits.Iterator coarseIterator = edits.getCoarseIterator();
         i = 0;
         while (coarseIterator.next()) {
             String expected = coarseIteratorExpected[i++];
-            assertEquals("Iteration #" + i, expected, coarseIterator.toString().substring(toStringOffset));
+            String actual = coarseIterator.toString();
+            assertEquals("Iteration #" + i, expected, actual.substring(actual.length() - expected.length()));
         }
         Edits.Iterator coarseChangesIterator = edits.getCoarseChangesIterator();
         i = 0;
         while (coarseChangesIterator.next()) {
             String expected = coarseChangesIteratorExpected[i++];
-            assertEquals("Iteration #" + i, expected, coarseChangesIterator.toString().substring(toStringOffset));
+            String actual = coarseChangesIterator.toString();
+            assertEquals("Iteration #" + i, expected, actual.substring(actual.length() - expected.length()));
         }
 
         // Demonstrate the iterator indexing methods: