You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mo...@apache.org on 2002/02/26 01:31:32 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestFastHashMap.java TestFastTreeMap.java TestHashMap.java TestSoftRefHashMap.java TestTreeMap.java
morgand 02/02/25 16:31:32
Modified: collections/src/test/org/apache/commons/collections
TestFastHashMap.java TestFastTreeMap.java
TestHashMap.java TestSoftRefHashMap.java
TestTreeMap.java
Log:
fixed errors where makeMap() had been changed to makeEmptyMap()
in superclasses but not subclasses, causing the wrong objects to be
tested
Revision Changes Path
1.4 +6 -6 jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap.java
Index: TestFastHashMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestFastHashMap.java 21 Apr 2001 12:22:30 -0000 1.3
+++ TestFastHashMap.java 26 Feb 2002 00:31:32 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastHashMap.java,v 1.3 2001/04/21 12:22:30 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/04/21 12:22:30 $
+ * $Header: /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.4 $
+ * $Date: 2002/02/26 00:31:32 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
/**
* @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
{
@@ -89,7 +89,7 @@
junit.textui.TestRunner.main(testCaseName);
}
- public Map makeMap() {
+ public Map makeEmptyMap() {
FastHashMap fhm = new FastHashMap();
fhm.setFast(false);
return (fhm);
@@ -97,7 +97,7 @@
public void setUp()
{
- map = (HashMap) makeMap();
+ map = (HashMap) makeEmptyMap();
}
}
1.5 +6 -6 jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap.java
Index: TestFastTreeMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestFastTreeMap.java 22 Feb 2002 02:18:50 -0000 1.4
+++ TestFastTreeMap.java 26 Feb 2002 00:31:32 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestFastTreeMap.java,v 1.4 2002/02/22 02:18:50 mas Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/22 02:18:50 $
+ * $Header: /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.5 $
+ * $Date: 2002/02/26 00:31:32 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
/**
* @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
{
@@ -89,7 +89,7 @@
junit.textui.TestRunner.main(testCaseName);
}
- public Map makeMap() {
+ public Map makeEmptyMap() {
FastTreeMap ftm = new FastTreeMap();
ftm.setFast(false);
return (ftm);
@@ -104,7 +104,7 @@
public void setUp()
{
- map = (TreeMap) makeMap();
+ map = (TreeMap) makeEmptyMap();
}
}
1.6 +4 -9 jakarta-commons/collections/src/test/org/apache/commons/collections/TestHashMap.java
Index: TestHashMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestHashMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestHashMap.java 26 Feb 2002 00:21:46 -0000 1.5
+++ TestHashMap.java 26 Feb 2002 00:31:32 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestHashMap.java,v 1.5 2002/02/26 00:21:46 morgand Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/26 00:21:46 $
+ * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestHashMap.java,v 1.6 2002/02/26 00:31:32 morgand Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/26 00:31:32 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
/**
* @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
{
@@ -82,11 +82,6 @@
{
String[] testCaseName = { TestHashMap.class.getName() };
junit.textui.TestRunner.main(testCaseName);
- }
-
- public Map makeEmptyMap() {
- HashMap hm = new HashMap();
- return (hm);
}
protected HashMap map = null;
1.2 +6 -6 jakarta-commons/collections/src/test/org/apache/commons/collections/TestSoftRefHashMap.java
Index: TestSoftRefHashMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSoftRefHashMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestSoftRefHashMap.java 6 May 2001 11:10:36 -0000 1.1
+++ TestSoftRefHashMap.java 26 Feb 2002 00:31:32 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSoftRefHashMap.java,v 1.1 2001/05/06 11:10:36 jstrachan Exp $
- * $Revision: 1.1 $
- * $Date: 2001/05/06 11:10:36 $
+ * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSoftRefHashMap.java,v 1.2 2002/02/26 00:31:32 morgand Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/26 00:31:32 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
/**
* @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
{
@@ -86,13 +86,13 @@
junit.textui.TestRunner.main(testCaseName);
}
- public Map makeMap() {
+ public Map makeEmptyMap() {
SoftRefHashMap map = new SoftRefHashMap();
return map;
}
public void setUp() {
- map = (HashMap) makeMap();
+ map = (HashMap) makeEmptyMap();
}
}
1.5 +4 -9 jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeMap.java
Index: TestTreeMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestTreeMap.java 26 Feb 2002 00:21:46 -0000 1.4
+++ TestTreeMap.java 26 Feb 2002 00:31:32 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeMap.java,v 1.4 2002/02/26 00:21:46 morgand Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/26 00:21:46 $
+ * $Header: /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.5 $
+ * $Date: 2002/02/26 00:31:32 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
/**
* @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
{
@@ -82,11 +82,6 @@
{
String[] testCaseName = { TestTreeMap.class.getName() };
junit.textui.TestRunner.main(testCaseName);
- }
-
- public Map makeEmptyMap() {
- TreeMap tm = new TreeMap();
- return (tm);
}
public boolean useNullKey() {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>