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

fixed errors where makeMap() had been changed to makeEmptyMap() 

in superclasses but not subclasses, causing the wrong objects to be
tested


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130587 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Morgan James Delagrange 2002-02-26 00:31:32 +00:00
parent fa381f7937
commit 5e5a18bf2f
5 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/org/apache/commons/collections/TestFastHashMap.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.3 2001/04/21 12:22:30 craigmcc Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.4 2002/02/26 00:31:32 morgand Exp $
* $Revision: 1.3 $ * $Revision: 1.4 $
* $Date: 2001/04/21 12:22:30 $ * $Date: 2002/02/26 00:31:32 $
* *
* ==================================================================== * ====================================================================
* *
@ -69,7 +69,7 @@ import java.util.Map;
/** /**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id: TestFastHashMap.java,v 1.3 2001/04/21 12:22:30 craigmcc Exp $ * @version $Id: TestFastHashMap.java,v 1.4 2002/02/26 00:31:32 morgand Exp $
*/ */
public class TestFastHashMap extends TestHashMap public class TestFastHashMap extends TestHashMap
{ {
@ -89,7 +89,7 @@ public class TestFastHashMap extends TestHashMap
junit.textui.TestRunner.main(testCaseName); junit.textui.TestRunner.main(testCaseName);
} }
public Map makeMap() { public Map makeEmptyMap() {
FastHashMap fhm = new FastHashMap(); FastHashMap fhm = new FastHashMap();
fhm.setFast(false); fhm.setFast(false);
return (fhm); return (fhm);
@ -97,7 +97,7 @@ public class TestFastHashMap extends TestHashMap
public void setUp() public void setUp()
{ {
map = (HashMap) makeMap(); map = (HashMap) makeEmptyMap();
} }
} }

12
src/test/org/apache/commons/collections/TestFastTreeMap.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v 1.4 2002/02/22 02:18:50 mas Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v 1.5 2002/02/26 00:31:32 morgand Exp $
* $Revision: 1.4 $ * $Revision: 1.5 $
* $Date: 2002/02/22 02:18:50 $ * $Date: 2002/02/26 00:31:32 $
* *
* ==================================================================== * ====================================================================
* *
@ -69,7 +69,7 @@ import java.util.TreeMap;
/** /**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id: TestFastTreeMap.java,v 1.4 2002/02/22 02:18:50 mas Exp $ * @version $Id: TestFastTreeMap.java,v 1.5 2002/02/26 00:31:32 morgand Exp $
*/ */
public class TestFastTreeMap extends TestTreeMap public class TestFastTreeMap extends TestTreeMap
{ {
@ -89,7 +89,7 @@ public class TestFastTreeMap extends TestTreeMap
junit.textui.TestRunner.main(testCaseName); junit.textui.TestRunner.main(testCaseName);
} }
public Map makeMap() { public Map makeEmptyMap() {
FastTreeMap ftm = new FastTreeMap(); FastTreeMap ftm = new FastTreeMap();
ftm.setFast(false); ftm.setFast(false);
return (ftm); return (ftm);
@ -104,7 +104,7 @@ public class TestFastTreeMap extends TestTreeMap
public void setUp() public void setUp()
{ {
map = (TreeMap) makeMap(); map = (TreeMap) makeEmptyMap();
} }
} }

13
src/test/org/apache/commons/collections/TestHashMap.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestHashMap.java,v 1.5 2002/02/26 00:21:46 morgand Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestHashMap.java,v 1.6 2002/02/26 00:31:32 morgand Exp $
* $Revision: 1.5 $ * $Revision: 1.6 $
* $Date: 2002/02/26 00:21:46 $ * $Date: 2002/02/26 00:31:32 $
* *
* ==================================================================== * ====================================================================
* *
@ -69,7 +69,7 @@ import java.util.Map;
/** /**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id: TestHashMap.java,v 1.5 2002/02/26 00:21:46 morgand Exp $ * @version $Id: TestHashMap.java,v 1.6 2002/02/26 00:31:32 morgand Exp $
*/ */
public abstract class TestHashMap extends TestMap public abstract class TestHashMap extends TestMap
{ {
@ -84,11 +84,6 @@ public abstract class TestHashMap extends TestMap
junit.textui.TestRunner.main(testCaseName); junit.textui.TestRunner.main(testCaseName);
} }
public Map makeEmptyMap() {
HashMap hm = new HashMap();
return (hm);
}
protected HashMap map = null; protected HashMap map = null;
public void setUp() public void setUp()

12
src/test/org/apache/commons/collections/TestSoftRefHashMap.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestSoftRefHashMap.java,v 1.1 2001/05/06 11:10:36 jstrachan Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestSoftRefHashMap.java,v 1.2 2002/02/26 00:31:32 morgand Exp $
* $Revision: 1.1 $ * $Revision: 1.2 $
* $Date: 2001/05/06 11:10:36 $ * $Date: 2002/02/26 00:31:32 $
* *
* ==================================================================== * ====================================================================
* *
@ -69,7 +69,7 @@ import java.util.HashMap;
/** /**
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a> * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Id: TestSoftRefHashMap.java,v 1.1 2001/05/06 11:10:36 jstrachan Exp $ * @version $Id: TestSoftRefHashMap.java,v 1.2 2002/02/26 00:31:32 morgand Exp $
*/ */
public class TestSoftRefHashMap extends TestHashMap public class TestSoftRefHashMap extends TestHashMap
{ {
@ -86,13 +86,13 @@ public class TestSoftRefHashMap extends TestHashMap
junit.textui.TestRunner.main(testCaseName); junit.textui.TestRunner.main(testCaseName);
} }
public Map makeMap() { public Map makeEmptyMap() {
SoftRefHashMap map = new SoftRefHashMap(); SoftRefHashMap map = new SoftRefHashMap();
return map; return map;
} }
public void setUp() { public void setUp() {
map = (HashMap) makeMap(); map = (HashMap) makeEmptyMap();
} }
} }

13
src/test/org/apache/commons/collections/TestTreeMap.java
View File

@ -1,7 +1,7 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestTreeMap.java,v 1.4 2002/02/26 00:21:46 morgand Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestTreeMap.java,v 1.5 2002/02/26 00:31:32 morgand Exp $
* $Revision: 1.4 $ * $Revision: 1.5 $
* $Date: 2002/02/26 00:21:46 $ * $Date: 2002/02/26 00:31:32 $
* *
* ==================================================================== * ====================================================================
* *
@ -69,7 +69,7 @@ import java.util.Map;
/** /**
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a> * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @version $Id: TestTreeMap.java,v 1.4 2002/02/26 00:21:46 morgand Exp $ * @version $Id: TestTreeMap.java,v 1.5 2002/02/26 00:31:32 morgand Exp $
*/ */
public abstract class TestTreeMap extends TestMap public abstract class TestTreeMap extends TestMap
{ {
@ -84,11 +84,6 @@ public abstract class TestTreeMap extends TestMap
junit.textui.TestRunner.main(testCaseName); junit.textui.TestRunner.main(testCaseName);
} }
public Map makeEmptyMap() {
TreeMap tm = new TreeMap();
return (tm);
}
public boolean useNullKey() { public boolean useNullKey() {
return false; return false;
} }