You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2010/09/30 17:42:54 UTC

svn commit: r1003109 - in /harmony/enhanced/java/trunk/classlib/modules/text: make/exclude.common src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java

Author: odeakin
Date: Thu Sep 30 15:42:54 2010
New Revision: 1003109

URL: http://svn.apache.org/viewvc?rev=1003109&view=rev
Log:
Apply fix for HARMONY-6527 ([classlib][text] CollationElementIterator tests fail) - I believe this is a non-bug difference, so modify the test to expect ICU behaviour.

Modified:
    harmony/enhanced/java/trunk/classlib/modules/text/make/exclude.common
    harmony/enhanced/java/trunk/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java

Modified: harmony/enhanced/java/trunk/classlib/modules/text/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/text/make/exclude.common?rev=1003109&r1=1003108&r2=1003109&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/text/make/exclude.common (original)
+++ harmony/enhanced/java/trunk/classlib/modules/text/make/exclude.common Thu Sep 30 15:42:54 2010
@@ -3,6 +3,3 @@ org/apache/harmony/text/tests/java/text/
 
 #HARMONY-6526
 org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
-
-#HARMONY-6527
-org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java

Modified: harmony/enhanced/java/trunk/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java?rev=1003109&r1=1003108&r2=1003109&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java Thu Sep 30 15:42:54 2010
@@ -167,7 +167,7 @@ public class CollationElementIteratorTes
 		CollationElementIterator iterator = rbColl
 				.getCollationElementIterator(text);
 		iterator.setOffset(1);
-		assertEquals(1, iterator.getOffset());
+		assertEquals(0, iterator.getOffset());
 	}
 
 	/*
@@ -183,7 +183,7 @@ public class CollationElementIteratorTes
 		assertEquals(1, iterator.getOffset());
 		iterator.setText("cha");
 		iterator.setOffset(1);
-		assertEquals(1, iterator.getOffset());
+		assertEquals(0, iterator.getOffset());
 	}
 
 	/*
@@ -199,6 +199,6 @@ public class CollationElementIteratorTes
 		assertEquals(1, iterator.getOffset());
 		iterator.setText(new StringCharacterIterator("cha"));
 		iterator.setOffset(1);
-		assertEquals(1, iterator.getOffset());
+		assertEquals(0, iterator.getOffset());
 	}
 }