Author: bayard Date: Tue Sep 15 05:57:29 2009 New Revision: 815127 URL: http://svn.apache.org/viewvc?rev=815127&view=rev Log: Merging from -r468106:814127 of collections_jdk5_branch - namely where this code was generified; mostly in r738956.
Also see the following revisions: ------------------------------------------------------------------------ r740150 | mbenson | 2009-02-02 15:24:00 -0800 (Mon, 02 Feb 2009) | 1 line make all [collections] maps implement IterableMap ------------------------------------------------------------------------ Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java?rev=815127&r1=815126&r2=815127&view=diff ============================================================================== --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java Tue Sep 15 05:57:29 2009 @@ -19,6 +19,8 @@ import java.util.HashMap; import java.util.Map; +import org.apache.commons.collections.IterableMap; + import junit.framework.Test; import junit.framework.TestSuite; @@ -31,7 +33,7 @@ * * @author Stephen Colebourne */ -public class TestFixedSizeMap extends AbstractTestMap { +public class TestFixedSizeMap<K, V> extends AbstractTestIterableMap<K, V> { public TestFixedSizeMap(String testName) { super(testName); @@ -46,16 +48,16 @@ junit.textui.TestRunner.main(testCaseName); } - public Map makeEmptyMap() { - return FixedSizeMap.decorate(new HashMap()); + public IterableMap<K, V> makeObject() { + return FixedSizeMap.decorate(new HashMap<K, V>()); } - public Map makeFullMap() { - Map map = new HashMap(); + public IterableMap<K, V> makeFullMap() { + Map<K, V> map = new HashMap<K, V>(); addSampleMappings(map); return FixedSizeMap.decorate(map); } - + public boolean isPutAddSupported() { return false; }