scolebourne 2003/10/06 16:44:23 Modified: collections/src/test/org/apache/commons/collections/decorators TestTransformedSortedMap.java Log: Actually test the class we are supposed to be testing Revision Changes Path 1.4 +15 -9 jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTransformedSortedMap.java Index: TestTransformedSortedMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/decorators/TestTransformedSortedMap.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestTransformedSortedMap.java 2 Oct 2003 23:01:09 -0000 1.3 +++ TestTransformedSortedMap.java 6 Oct 2003 23:44:23 -0000 1.4 @@ -57,9 +57,9 @@ */ package org.apache.commons.collections.decorators; -import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import junit.framework.Test; import junit.framework.TestSuite; @@ -67,7 +67,7 @@ import org.apache.commons.collections.AbstractTestSortedMap; /** - * Extension of [EMAIL PROTECTED] TestSortedMap} for exercising the [EMAIL PROTECTED] TransformedSortedMap} + * Extension of [EMAIL PROTECTED] AbstractTestSortedMap} for exercising the [EMAIL PROTECTED] TransformedSortedMap} * implementation. * * @since Commons Collections 3.0 @@ -91,27 +91,33 @@ } public Map makeEmptyMap() { - return TransformedMap.decorate(new HashMap(), TestTransformedCollection.NOOP_TRANSFORMER, TestTransformedCollection.NOOP_TRANSFORMER); + return TransformedSortedMap.decorate(new TreeMap(), TestTransformedCollection.NOOP_TRANSFORMER, TestTransformedCollection.NOOP_TRANSFORMER); } public void testTransformedMap() { Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"}; - Map map = TransformedMap.decorate(new HashMap(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER, null); + Map map = TransformedSortedMap.decorate(new TreeMap(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER, null); assertEquals(0, map.size()); for (int i = 0; i < els.length; i++) { map.put(els[i], els[i]); assertEquals(i + 1, map.size()); assertEquals(true, map.containsKey(new Integer((String) els[i]))); - assertEquals(false, map.containsKey(els[i])); + try { + map.containsKey(els[i]); + fail(); + } catch (ClassCastException ex) {} assertEquals(true, map.containsValue(els[i])); assertEquals(els[i], map.get(new Integer((String) els[i]))); } - assertEquals(null, map.remove(els[0])); + try { + map.remove(els[0]); + fail(); + } catch (ClassCastException ex) {} assertEquals(els[0], map.remove(new Integer((String) els[0]))); - map = TransformedMap.decorate(new HashMap(), null, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER); + map = TransformedSortedMap.decorate(new TreeMap(), null, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER); assertEquals(0, map.size()); for (int i = 0; i < els.length; i++) { map.put(els[i], els[i]);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]