diff options
Diffstat (limited to 'harmony-tests')
3 files changed, 32 insertions, 58 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollationElementIteratorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollationElementIteratorTest.java index dc0f4b7..0ca489c 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollationElementIteratorTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollationElementIteratorTest.java @@ -66,6 +66,8 @@ public class CollationElementIteratorTest extends TestCase { int offset = iterator.getOffset(); assertEquals(text.length(), offset); + + iterator.reset(); order = iterator.previous(); while (order != CollationElementIterator.NULLORDER) { @@ -91,6 +93,8 @@ public class CollationElementIteratorTest extends TestCase { int offset = iterator.getOffset(); assertEquals(text.length(), offset); + + iterator.reset(); order = iterator.previous(); while (order != CollationElementIterator.NULLORDER) { @@ -176,19 +180,31 @@ public class CollationElementIteratorTest extends TestCase { RuleBasedCollator rbColl = (RuleBasedCollator) Collator.getInstance(new Locale("es", "", "TRADITIONAL")); String text = "cha"; CollationElementIterator iterator = rbColl.getCollationElementIterator(text); + iterator.setOffset(0); + assertEquals(0, iterator.getOffset()); iterator.setOffset(1); - assertEquals(1, iterator.getOffset()); + assertEquals(0, iterator.getOffset()); + iterator.setOffset(2); + assertEquals(2, iterator.getOffset()); } public void testSetTextString() { RuleBasedCollator rbColl = (RuleBasedCollator) Collator.getInstance(new Locale("es", "", "TRADITIONAL")); String text = "caa"; CollationElementIterator iterator = rbColl.getCollationElementIterator(text); + iterator.setOffset(0); + assertEquals(0, iterator.getOffset()); iterator.setOffset(1); assertEquals(1, iterator.getOffset()); + iterator.setOffset(2); + assertEquals(2, iterator.getOffset()); iterator.setText("cha"); + iterator.setOffset(0); + assertEquals(0, iterator.getOffset()); iterator.setOffset(1); - assertEquals(1, iterator.getOffset()); + assertEquals(0, iterator.getOffset()); + iterator.setOffset(2); + assertEquals(2, iterator.getOffset()); } public void testSetTextCharacterIterator() { diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollatorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollatorTest.java index 673fe87..9f5d141 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollatorTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollatorTest.java @@ -1,13 +1,13 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,9 +23,6 @@ import java.util.Locale; public class CollatorTest extends junit.framework.TestCase { - /** - * @tests java.text.Collator#clone() - */ public void test_clone() { Collator c = Collator.getInstance(Locale.GERMAN); Collator c2 = (Collator) c.clone(); @@ -33,9 +30,6 @@ public class CollatorTest extends junit.framework.TestCase { assertTrue("Clones were equivalent", c != c2); } - /** - * @tests java.text.Collator#compare(java.lang.Object, java.lang.Object) - */ public void test_compareLjava_lang_ObjectLjava_lang_Object() { Collator c = Collator.getInstance(Locale.FRENCH); Object o, o2; @@ -119,9 +113,6 @@ public class CollatorTest extends junit.framework.TestCase { fail("Failed to throw ClassCastException"); } - /** - * @tests java.text.Collator#equals(java.lang.Object) - */ public void test_equalsLjava_lang_Object() { Collator c = Collator.getInstance(Locale.ENGLISH); Collator c2 = (Collator) c.clone(); @@ -130,9 +121,6 @@ public class CollatorTest extends junit.framework.TestCase { assertTrue("Collators with different strengths equal", !c.equals(c2)); } - /** - * @tests java.text.Collator#equals(java.lang.String, java.lang.String) - */ public void test_equalsLjava_lang_StringLjava_lang_String() { Collator c = Collator.getInstance(Locale.FRENCH); @@ -168,10 +156,6 @@ public class CollatorTest extends junit.framework.TestCase { assertTrue("d) Failed on equivalence", c.equals("e", "e")); } - /** - * @tests java.text.Collator#getAvailableLocales() - */ - //FIXME This test fails on Harmony ClassLibrary public void failing_test_getAvailableLocales() { Locale[] locales = Collator.getAvailableLocales(); assertTrue("No locales", locales.length > 0); @@ -199,10 +183,6 @@ public class CollatorTest extends junit.framework.TestCase { assertTrue("Missing locales", english && german); } - /** - * @tests java.text.Collator#getDecomposition() - */ - //FIXME This test fails on Harmony ClassLibrary public void failing_test_getDecomposition() { RuleBasedCollator collator; try { @@ -215,40 +195,21 @@ public class CollatorTest extends junit.framework.TestCase { collator.getDecomposition() == Collator.CANONICAL_DECOMPOSITION); } - /** - * @tests java.text.Collator#getInstance() - */ public void test_getInstance() { Collator c1 = Collator.getInstance(); Collator c2 = Collator.getInstance(Locale.getDefault()); assertTrue("Wrong locale", c1.equals(c2)); } - /** - * @tests java.text.Collator#getInstance(java.util.Locale) - */ public void test_getInstanceLjava_util_Locale() { assertTrue("Used to test", true); } - /** - * @tests java.text.Collator#getStrength() - */ - public void test_getStrength() { - RuleBasedCollator collator; - try { - collator = new RuleBasedCollator("; \u0300 < a, A < b < c < d"); - } catch (ParseException e) { - fail("ParseException"); - return; - } + public void test_getStrength() throws ParseException { + RuleBasedCollator collator = new RuleBasedCollator("&9 ; \u0300 < a, A < b < c < d"); assertTrue("Wrong default", collator.getStrength() == Collator.TERTIARY); } - /** - * @tests java.text.Collator#setDecomposition(int) - */ - //FIXME This test fails on Harmony ClassLibrary public void failing_test_setDecompositionI() { Collator c = Collator.getInstance(Locale.FRENCH); c.setStrength(Collator.IDENTICAL); @@ -267,9 +228,6 @@ public class CollatorTest extends junit.framework.TestCase { "\u2163", "IV")); // roman number "IV" } - /** - * @tests java.text.Collator#setStrength(int) - */ public void test_setStrengthI() { assertTrue("Used to test", true); } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/RuleBasedCollatorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/RuleBasedCollatorTest.java index 3e8f28d..89dfea9 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/RuleBasedCollatorTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/RuleBasedCollatorTest.java @@ -33,7 +33,7 @@ public class RuleBasedCollatorTest extends TestCase { public void test_getCollationKeyLjava_lang_String() throws Exception { // Regression test for HARMONY-28 String source = null; - String Simple = "< a< b< c< d"; + String Simple = "&9 < a< b< c< d"; RuleBasedCollator rbc = new RuleBasedCollator(Simple); CollationKey ck = rbc.getCollationKey(source); assertNull("Assert 1: getCollationKey (null) does not return null", ck); @@ -41,13 +41,13 @@ public class RuleBasedCollatorTest extends TestCase { public void testHashCode() throws ParseException { { - String rule = "< a < b < c < d"; + String rule = "&9 < a < b < c < d"; RuleBasedCollator coll = new RuleBasedCollator(rule); assertEquals(rule.hashCode(), coll.hashCode()); } { - String rule = "< a < b < c < d < e"; + String rule = "&9 < a < b < c < d < e"; RuleBasedCollator coll = new RuleBasedCollator(rule); assertEquals(rule.hashCode(), coll.hashCode()); } @@ -63,7 +63,7 @@ public class RuleBasedCollatorTest extends TestCase { } public void testEqualsObject() throws ParseException { - String rule = "< a < b < c < d < e"; + String rule = "&9 < a < b < c < d < e"; RuleBasedCollator coll = new RuleBasedCollator(rule); assertEquals(Collator.TERTIARY, coll.getStrength()); @@ -80,7 +80,7 @@ public class RuleBasedCollatorTest extends TestCase { } public void testCompareStringString() throws ParseException { - String rule = "< c < b < a"; + String rule = "&9 < c < b < a"; RuleBasedCollator coll = new RuleBasedCollator(rule); assertEquals(-1, coll.compare("c", "a")); } @@ -98,7 +98,7 @@ public class RuleBasedCollatorTest extends TestCase { } public void testGetRules() throws ParseException { - String rule = "< a = b < c"; + String rule = "&9 < a = b < c"; RuleBasedCollator coll = new RuleBasedCollator(rule); assertEquals(rule, coll.getRules()); } @@ -139,7 +139,7 @@ public class RuleBasedCollatorTest extends TestCase { } //Regression for HARMONY-1352 try { - new RuleBasedCollator("< a< b< c< d").getCollationElementIterator((String)null); + new RuleBasedCollator("&9 < a< b< c< d").getCollationElementIterator((String)null); fail(); } catch (NullPointerException expected) { } @@ -184,7 +184,7 @@ public class RuleBasedCollatorTest extends TestCase { } //Regression for HARMONY-1352 try { - new RuleBasedCollator("< a< b< c< d").getCollationElementIterator((CharacterIterator)null); + new RuleBasedCollator("&9 < a< b< c< d").getCollationElementIterator((CharacterIterator)null); fail(); } catch (NullPointerException expected) { } @@ -244,7 +244,7 @@ public class RuleBasedCollatorTest extends TestCase { public void testCompareNull() throws Exception { //Regression for HARMONY-836 try { - new RuleBasedCollator("< a").compare(null, null); + new RuleBasedCollator("&9 < a").compare(null, null); fail(); } catch (NullPointerException expected) { } |