You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2002/11/01 20:07:54 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/iterators TestFilterIterator.java TestFilterListIterator.java
rwaldhoff 2002/11/01 11:07:54
Modified: collections/src/test/org/apache/commons/collections
TestMap.java TestSequencedHashMap.java
collections/src/test/org/apache/commons/collections/iterators
TestFilterIterator.java TestFilterListIterator.java
Log:
have all setUp and tearDown methods throw Exception, so they can be extended more easily (see http://issues.apache.org/bugzilla/show_bug.cgi?id=14151)
update/fix copyright in a few of these touched files
Revision Changes Path
1.21 +6 -6 jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java
Index: TestMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TestMap.java 13 Oct 2002 13:55:35 -0000 1.20
+++ TestMap.java 1 Nov 2002 19:07:53 -0000 1.21
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -152,7 +152,7 @@
* @author Michael Smith
* @author Rodney Waldhoff
* @author Paul Jack
- * @version $Id$
+ * @version $Revision$ $Date$
*/
public abstract class TestMap extends TestObject {
@@ -1119,7 +1119,7 @@
/**
* Erases any leftover instance variables by setting them to null.
*/
- protected void tearDown() {
+ protected void tearDown() throws Exception {
map = null;
keySet = null;
entrySet = null;
1.16 +2 -2 jakarta-commons/collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java
Index: TestSequencedHashMap.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TestSequencedHashMap.java 12 Oct 2002 22:36:21 -0000 1.15
+++ TestSequencedHashMap.java 1 Nov 2002 19:07:53 -0000 1.16
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -206,7 +206,7 @@
map2.getLastKey(),getSampleKeys()[getSampleKeys().length - 1]);
}
- protected void tearDown() {
+ protected void tearDown() throws Exception {
labRat = null;
}
}
1.3 +5 -5 jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
Index: TestFilterIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestFilterIterator.java 12 Oct 2002 22:36:23 -0000 1.2
+++ TestFilterIterator.java 1 Nov 2002 19:07:54 -0000 1.3
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -93,7 +93,7 @@
/**
* Tear down instance variables required by this test case.
*/
- public void tearDown() {
+ public void tearDown() throws Exception {
iterator = null;
}
1.3 +6 -6 jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
Index: TestFilterListIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestFilterListIterator.java 12 Oct 2002 22:36:23 -0000 1.2
+++ TestFilterListIterator.java 1 Nov 2002 19:07:54 -0000 1.3
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -155,7 +155,7 @@
}
- public void tearDown() {
+ public void tearDown() throws Exception {
list = null;
odds = null;
evens = null;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>