Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
    ------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@815122 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2009-09-15 05:57:20 +00:00
parent 628bcc433a
commit 5e234b76ad
1 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/test/org/apache/commons/collections/map/AbstractTestIterableMap.java
View File

@ -32,7 +32,7 @@ import org.apache.commons.collections.iterators.AbstractTestMapIterator;
*
* @author Stephen Colebourne
*/
public abstract class AbstractTestIterableMap extends AbstractTestMap {
public abstract class AbstractTestIterableMap<K, V> extends AbstractTestMap<K, V> {
/**
* JUnit constructor.
@ -43,22 +43,37 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap {
super(testName);
}
/**
* {@inheritDoc}
*/
@Override
public abstract IterableMap<K, V> makeObject();
/**
* {@inheritDoc}
*/
@Override
public IterableMap<K, V> makeFullMap() {
return (IterableMap<K, V>) super.makeFullMap();
}
//-----------------------------------------------------------------------
public void testFailFastEntrySet() {
if (isRemoveSupported() == false) return;
if (isFailFastExpected() == false) return;
resetFull();
Iterator it = map.entrySet().iterator();
Map.Entry val = (Map.Entry) it.next();
map.remove(val.getKey());
Iterator<Map.Entry<K, V>> it = getMap().entrySet().iterator();
Map.Entry<K, V> val = it.next();
getMap().remove(val.getKey());
try {
it.next();
fail();
} catch (ConcurrentModificationException ex) {}
resetFull();
it = map.entrySet().iterator();
it = getMap().entrySet().iterator();
it.next();
map.clear();
getMap().clear();
try {
it.next();
fail();
@ -67,19 +82,20 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap {
public void testFailFastKeySet() {
if (isRemoveSupported() == false) return;
if (isFailFastExpected() == false) return;
resetFull();
Iterator it = map.keySet().iterator();
Object val = it.next();
map.remove(val);
Iterator<K> it = getMap().keySet().iterator();
K val = it.next();
getMap().remove(val);
try {
it.next();
fail();
} catch (ConcurrentModificationException ex) {}
resetFull();
it = map.keySet().iterator();
it = getMap().keySet().iterator();
it.next();
map.clear();
getMap().clear();
try {
it.next();
fail();
@ -88,19 +104,20 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap {
public void testFailFastValues() {
if (isRemoveSupported() == false) return;
if (isFailFastExpected() == false) return;
resetFull();
Iterator it = map.values().iterator();
Iterator<V> it = getMap().values().iterator();
it.next();
map.remove(map.keySet().iterator().next());
getMap().remove(getMap().keySet().iterator().next());
try {
it.next();
fail();
} catch (ConcurrentModificationException ex) {}
resetFull();
it = map.values().iterator();
it = getMap().values().iterator();
it.next();
map.clear();
getMap().clear();
try {
it.next();
fail();
@ -112,12 +129,12 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap {
return new InnerTestMapIterator();
}
public class InnerTestMapIterator extends AbstractTestMapIterator {
public class InnerTestMapIterator extends AbstractTestMapIterator<K, V> {
public InnerTestMapIterator() {
super("InnerTestMapIterator");
}
public Object[] addSetValues() {
public V[] addSetValues() {
return AbstractTestIterableMap.this.getNewSampleValues();
}
@ -133,24 +150,24 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap {
return AbstractTestIterableMap.this.isSetValueSupported();
}
public MapIterator makeEmptyMapIterator() {
public MapIterator<K, V> makeEmptyIterator() {
resetEmpty();
return ((IterableMap) AbstractTestIterableMap.this.map).mapIterator();
return AbstractTestIterableMap.this.getMap().mapIterator();
}
public MapIterator makeFullMapIterator() {
public MapIterator<K, V> makeObject() {
resetFull();
return ((IterableMap) AbstractTestIterableMap.this.map).mapIterator();
return AbstractTestIterableMap.this.getMap().mapIterator();
}
public Map getMap() {
public Map<K, V> getMap() {
// assumes makeFullMapIterator() called first
return AbstractTestIterableMap.this.map;
return AbstractTestIterableMap.this.getMap();
}
public Map getConfirmedMap() {
public Map<K, V> getConfirmedMap() {
// assumes makeFullMapIterator() called first
return AbstractTestIterableMap.this.confirmed;
return AbstractTestIterableMap.this.getConfirmed();
}
public void verify() {
@ -165,4 +182,12 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap {
// resetFull();
// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/HashedMap.fullCollection.version3.obj");
// }
/**
* {@inheritDoc}
*/
@Override
public IterableMap<K, V> getMap() {
return (IterableMap<K, V>) super.getMap();
}
}