scolebourne 2003/12/06 17:22:50 Modified: collections/src/test/org/apache/commons/collections/map TestIdentityMap.java TestHashedMap.java TestLinkedMap.java Log: Additional testing of new maps Revision Changes Path 1.3 +12 -3 jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestIdentityMap.java Index: TestIdentityMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestIdentityMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestIdentityMap.java 2 Dec 2003 23:51:49 -0000 1.2 +++ TestIdentityMap.java 7 Dec 2003 01:22:50 -0000 1.3 @@ -64,8 +64,8 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.AbstractTestObject; +import org.apache.commons.collections.IterableMap; /** * JUnit tests. @@ -152,4 +152,13 @@ assertEquals(false, entry1.equals(entry3)); } +// public void testCreate() throws Exception { +// Map map = new IdentityMap(); +// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/IdentityMap.emptyCollection.version3.obj"); +// map = new IdentityMap(); +// map.put(I1A, I2A); +// map.put(I1B, I2A); +// map.put(I2A, I2B); +// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/IdentityMap.fullCollection.version3.obj"); +// } } 1.3 +8 -2 jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestHashedMap.java Index: TestHashedMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestHashedMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TestHashedMap.java 2 Dec 2003 23:51:49 -0000 1.2 +++ TestHashedMap.java 7 Dec 2003 01:22:50 -0000 1.3 @@ -93,4 +93,10 @@ return "3"; } +// public void testCreate() throws Exception { +// resetEmpty(); +// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/HashedMap.emptyCollection.version3.obj"); +// resetFull(); +// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/HashedMap.fullCollection.version3.obj"); +// } } 1.2 +48 -2 jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestLinkedMap.java Index: TestLinkedMap.java =================================================================== RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestLinkedMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TestLinkedMap.java 3 Dec 2003 19:04:41 -0000 1.1 +++ TestLinkedMap.java 7 Dec 2003 01:22:50 -0000 1.2 @@ -58,6 +58,7 @@ package org.apache.commons.collections.map; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -111,6 +112,51 @@ assertSame(list.get(1), it.next()); it.reset(); assertSame(list.get(0), it.next()); + } + + //----------------------------------------------------------------------- + public void testInsertionOrder() { + if (isPutAddSupported() == false || isPutChangeSupported() == false) return; + Object[] keys = getSampleKeys(); + Object[] values = getSampleValues(); + Iterator it = null; + + resetEmpty(); + map.put(keys[0], values[0]); + map.put(keys[1], values[1]); + it = map.keySet().iterator(); + assertSame(keys[0], it.next()); + assertSame(keys[1], it.next()); + it = map.values().iterator(); + assertSame(values[0], it.next()); + assertSame(values[1], it.next()); + + // no change to order + map.put(keys[1], values[1]); + it = map.keySet().iterator(); + assertSame(keys[0], it.next()); + assertSame(keys[1], it.next()); + it = map.values().iterator(); + assertSame(values[0], it.next()); + assertSame(values[1], it.next()); + + // no change to order + map.put(keys[1], values[2]); + it = map.keySet().iterator(); + assertSame(keys[0], it.next()); + assertSame(keys[1], it.next()); + it = map.values().iterator(); + assertSame(values[0], it.next()); + assertSame(values[2], it.next()); + + // no change to order + map.put(keys[0], values[3]); + it = map.keySet().iterator(); + assertSame(keys[0], it.next()); + assertSame(keys[1], it.next()); + it = map.values().iterator(); + assertSame(values[3], it.next()); + assertSame(values[2], it.next()); } // public void testCreate() throws Exception {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]