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

Allow subclasses to change the confirmed map 

Ensure views pickup correct serialization methods


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131304 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-10-31 01:24:32 +00:00
parent 165f6f675a
commit 27a4c25922
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/test/org/apache/commons/collections/AbstractTestMap.java
View File

@ -1,5 +1,5 @@
/*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/AbstractTestMap.java,v 1.8 2003/10/10 21:19:39 scolebourne Exp $
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/AbstractTestMap.java,v 1.9 2003/10/31 01:24:32 scolebourne Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@ -152,7 +152,7 @@ import java.util.Set;
* @author Rodney Waldhoff
* @author Paul Jack
* @author Stephen Colebourne
* @version $Revision: 1.8 $ $Date: 2003/10/10 21:19:39 $
* @version $Revision: 1.9 $ $Date: 2003/10/31 01:24:32 $
*/
public abstract class AbstractTestMap extends AbstractTestObject {
@ -412,6 +412,15 @@ public abstract class AbstractTestMap extends AbstractTestObject {
return makeEmptyMap();
}
/**
* Override to return a map other than HashMap as the confirmed map.
*
* @return a map that is known to be valid
*/
protected Map makeConfirmedMap() {
return new HashMap();
}
//-----------------------------------------------------------------------
/**
* Test to ensure the test setup is working properly. This method checks
@ -841,7 +850,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
resetEmpty();
m2 = new HashMap();
m2 = makeConfirmedMap();
Object[] keys = getSampleKeys();
Object[] values = getSampleValues();
for(int i = 0; i < keys.length; i++) {
@ -1056,7 +1065,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
private Map.Entry[] makeEntryArray(Object[] keys, Object[] values) {
Map.Entry[] result = new Map.Entry[keys.length];
for (int i = 0; i < keys.length; i++) {
Map map = new HashMap();
Map map = makeConfirmedMap();
map.put(keys[i], values[i]);
result[i] = (Map.Entry) map.entrySet().iterator().next();
}
@ -1107,11 +1116,16 @@ public abstract class AbstractTestMap extends AbstractTestObject {
// Collection views don't support add operations.
return false;
}
protected boolean isRemoveSupported() {
// Entry set should only support remove if map does
return AbstractTestMap.this.isRemoveSupported();
}
protected boolean supportsEmptyCollections() {
return AbstractTestMap.this.supportsEmptyCollections();
}
protected boolean supportsFullCollections() {
return AbstractTestMap.this.supportsFullCollections();
}
protected void resetFull() {
AbstractTestMap.this.resetFull();
@ -1167,14 +1181,18 @@ public abstract class AbstractTestMap extends AbstractTestObject {
protected boolean isNullSupported() {
return AbstractTestMap.this.isAllowNullKey();
}
protected boolean isAddSupported() {
return false;
}
protected boolean isRemoveSupported() {
return AbstractTestMap.this.isRemoveSupported();
}
protected boolean supportsEmptyCollections() {
return AbstractTestMap.this.supportsEmptyCollections();
}
protected boolean supportsFullCollections() {
return AbstractTestMap.this.supportsFullCollections();
}
protected void resetEmpty() {
AbstractTestMap.this.resetEmpty();
@ -1232,14 +1250,18 @@ public abstract class AbstractTestMap extends AbstractTestObject {
protected boolean isNullSupported() {
return AbstractTestMap.this.isAllowNullKey();
}
protected boolean isAddSupported() {
return false;
}
protected boolean isRemoveSupported() {
return AbstractTestMap.this.isRemoveSupported();
}
protected boolean supportsEmptyCollections() {
return AbstractTestMap.this.supportsEmptyCollections();
}
protected boolean supportsFullCollections() {
return AbstractTestMap.this.supportsFullCollections();
}
protected boolean areEqualElementsDistinguishable() {
// equal values are associated with different keys, so they are
@ -1287,10 +1309,9 @@ public abstract class AbstractTestMap extends AbstractTestObject {
protected void resetEmpty() {
this.map = makeEmptyMap();
views();
this.confirmed = new HashMap();
this.confirmed = makeConfirmedMap();
}
/**
* Resets the {@link #map}, {@link #entrySet}, {@link #keySet},
* {@link #values} and {@link #confirmed} fields to full.
@ -1298,7 +1319,7 @@ public abstract class AbstractTestMap extends AbstractTestObject {
protected void resetFull() {
this.map = makeFullMap();
views();
this.confirmed = new HashMap();
this.confirmed = makeConfirmedMap();
Object[] k = getSampleKeys();
Object[] v = getSampleValues();
for (int i = 0; i < k.length; i++) {