Moved tests from JUnit 3 to JUnit 4 nomenclature. Closes #44.

Author: sfuhrm

src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java

@@ -22,18 +22,22 @@
 import java.util.ListIterator;
 import java.util.Random;
 
-import junit.framework.TestCase;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.PredicateUtils;
 import org.apache.commons.collections4.list.GrowthList;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Tests the FilterListIterator class.
  *
  */
 @SuppressWarnings("boxing")
-public class FilterListIteratorTest extends TestCase {
+public class FilterListIteratorTest {
 
     private ArrayList<Integer> list = null;
     private ArrayList<Integer> odds = null;
@@ -49,7 +53,7 @@ public class FilterListIteratorTest extends TestCase {
     private Predicate<Integer> fourPred = null;
     private final Random random = new Random();
 
-    @Override
+    @Before
     public void setUp() {
         list = new ArrayList<>();
         odds = new ArrayList<>();
@@ -110,7 +114,7 @@ public boolean evaluate(final Integer x) {
 
     }
 
-    @Override
+    @After
     public void tearDown() throws Exception {
         list = null;
         odds = null;
@@ -126,11 +130,13 @@ public void tearDown() throws Exception {
         fourPred = null;
     }
 
+    @Test
     public void testWalkLists() {
         // this just confirms that our walkLists method works OK
         walkLists(list,list.listIterator());
     }
 
+    @Test
     public void testManual() {
         // do this one "by hand" as a sanity check
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
@@ -190,36 +196,43 @@ public void testManual() {
         assertEquals(Integer.valueOf(9), filtered.previous());
     }
 
+    @Test
     public void testTruePredicate() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), truePred);
         walkLists(list, filtered);
     }
 
+    @Test
     public void testFalsePredicate() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), falsePred);
         walkLists(new ArrayList<Integer>(), filtered);
     }
 
+    @Test
     public void testEvens() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), evenPred);
         walkLists(evens, filtered);
     }
 
+    @Test
     public void testOdds() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), oddPred);
         walkLists(odds, filtered);
     }
 
+    @Test
     public void testThrees() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
         walkLists(threes, filtered);
     }
 
+    @Test
     public void testFours() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), fourPred);
         walkLists(fours, filtered);
     }
 
+    @Test
     public void testNestedSixes() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(
                                         new FilterListIterator<>(list.listIterator(), threePred),
@@ -228,6 +241,7 @@ public void testNestedSixes() {
         walkLists(sixes, filtered);
     }
 
+    @Test
     public void testNestedSixes2() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(
                                         new FilterListIterator<>(list.listIterator(), evenPred),
@@ -236,6 +250,7 @@ public void testNestedSixes2() {
         walkLists(sixes, filtered);
     }
 
+    @Test
     public void testNestedSixes3() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(
                                         new FilterListIterator<>(list.listIterator(), threePred),
@@ -244,6 +259,7 @@ public void testNestedSixes3() {
         walkLists(sixes, new FilterListIterator<>(filtered, truePred));
     }
 
+    @Test
     public void testNextChangesPrevious() {
         {
             final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
@@ -256,6 +272,7 @@ public void testNextChangesPrevious() {
         }
     }
 
+    @Test
     public void testPreviousChangesNext() {
         {
             final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
@@ -271,6 +288,7 @@ public void testPreviousChangesNext() {
         }
     }
 
+    @Test
     public void testFailingHasNextBug() {
         final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), fourPred);
         final ListIterator<Integer> expected = fours.listIterator();
@@ -286,6 +304,7 @@ public void testFailingHasNextBug() {
     /**
      * Test for {@link "https://issues.apache.org/jira/browse/COLLECTIONS-360 COLLECTIONS-360"}
      */
+    @Test
     public void testCollections360() throws Throwable {
         final Collection<Predicate<Object>> var7 = new GrowthList<>();
         final Predicate<Object> var9 = PredicateUtils.anyPredicate(var7);

src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java

@@ -21,14 +21,16 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * Tests the IteratorEnumeration.
  *
  */
-public class IteratorEnumerationTest extends TestCase {
+public class IteratorEnumerationTest {
 
+    @Test
     public void testEnumeration() {
         final Iterator<String> iterator = Arrays.asList("a", "b", "c").iterator();
         final IteratorEnumeration<String> enumeration = new IteratorEnumeration<>(iterator);

src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java

@@ -21,17 +21,20 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Tests the LoopingIterator class.
  *
  */
-public class LoopingIteratorTest extends TestCase {
+public class LoopingIteratorTest {
 
     /**
      * Tests constructor exception.
      */
+    @Test
     public void testConstructorEx() throws Exception {
         try {
             new LoopingIterator<>(null);
@@ -44,6 +47,7 @@ public void testConstructorEx() throws Exception {
      * Tests whether an empty looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping0() throws Exception {
         final List<Object> list = new ArrayList<>();
         final LoopingIterator<Object> loop = new LoopingIterator<>(list);
@@ -60,6 +64,7 @@ public void testLooping0() throws Exception {
      * Tests whether a populated looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping1() throws Exception {
         final List<String> list = Arrays.asList("a");
         final LoopingIterator<String> loop = new LoopingIterator<>(list);
@@ -79,6 +84,7 @@ public void testLooping1() throws Exception {
      * Tests whether a populated looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping2() throws Exception {
         final List<String> list = Arrays.asList("a", "b");
         final LoopingIterator<String> loop = new LoopingIterator<>(list);
@@ -98,6 +104,7 @@ public void testLooping2() throws Exception {
      * Tests whether a populated looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping3() throws Exception {
         final List<String> list = Arrays.asList("a", "b", "c");
         final LoopingIterator<String> loop = new LoopingIterator<>(list);
@@ -120,6 +127,7 @@ public void testLooping3() throws Exception {
      * Tests the remove() method on a LoopingIterator wrapped ArrayList.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testRemoving1() throws Exception {
         final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
         final LoopingIterator<String> loop = new LoopingIterator<>(list);
@@ -152,6 +160,7 @@ public void testRemoving1() throws Exception {
      * Tests the reset() method on a LoopingIterator wrapped ArrayList.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testReset() throws Exception {
         final List<String> list = Arrays.asList("a", "b", "c");
         final LoopingIterator<String> loop = new LoopingIterator<>(list);
@@ -174,6 +183,7 @@ public void testReset() throws Exception {
      * Tests the size() method on a LoopingIterator wrapped ArrayList.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testSize() throws Exception {
         final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
         final LoopingIterator<String> loop = new LoopingIterator<>(list);

src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java

@@ -21,17 +21,19 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * Tests the LoopingListIterator class.
  *
  */
-public class LoopingListIteratorTest extends TestCase {
+public class LoopingListIteratorTest {
 
     /**
      * Tests constructor exception.
      */
+    @Test
     public void testConstructorEx() throws Exception {
         try {
             new LoopingListIterator<>(null);
@@ -43,6 +45,7 @@ public void testConstructorEx() throws Exception {
     /**
      * Tests whether an empty looping list iterator works.
      */
+    @Test
     public void testLooping0() throws Exception {
         final List<Object> list = new ArrayList<>();
         final LoopingListIterator<Object> loop = new LoopingListIterator<>(list);
@@ -66,6 +69,7 @@ public void testLooping0() throws Exception {
      * Tests whether a looping list iterator works on a list with only
      * one element.
      */
+    @Test
     public void testLooping1() throws Exception {
         final List<String> list = Arrays.asList("a");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a>
@@ -93,6 +97,7 @@ public void testLooping1() throws Exception {
      * Tests whether a looping list iterator works on a list with two
      * elements.
      */
+    @Test
     public void testLooping2() throws Exception {
         final List<String> list = Arrays.asList("a", "b");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b
@@ -123,6 +128,7 @@ public void testLooping2() throws Exception {
      * Tests jogging back and forth between two elements, but not over
      * the begin/end boundary of the list.
      */
+    @Test
     public void testJoggingNotOverBoundary() {
         final List<String> list = Arrays.asList("a", "b");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b
@@ -143,6 +149,7 @@ public void testJoggingNotOverBoundary() {
      * Tests jogging back and forth between two elements over the
      * begin/end boundary of the list.
      */
+    @Test
     public void testJoggingOverBoundary() {
         final List<String> list = Arrays.asList("a", "b");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b
@@ -161,6 +168,7 @@ public void testJoggingOverBoundary() {
     /**
      * Tests removing an element from a wrapped ArrayList.
      */
+    @Test
     public void testRemovingElementsAndIteratingForward() {
         final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
@@ -191,6 +199,7 @@ public void testRemovingElementsAndIteratingForward() {
     /**
      * Tests removing an element from a wrapped ArrayList.
      */
+    @Test
     public void testRemovingElementsAndIteratingBackwards() {
         final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
@@ -221,6 +230,7 @@ public void testRemovingElementsAndIteratingBackwards() {
     /**
      * Tests the reset method.
      */
+    @Test
     public void testReset() {
         final List<String> list = Arrays.asList("a", "b", "c");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
@@ -248,6 +258,7 @@ public void testReset() {
     /**
      * Tests the add method.
      */
+    @Test
     public void testAdd() {
         List<String> list = new ArrayList<>(Arrays.asList("b", "e", "f"));
         LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <b> e f
@@ -302,6 +313,7 @@ public void testAdd() {
     /**
      * Tests nextIndex and previousIndex.
      */
+    @Test
     public void testNextAndPreviousIndex() {
         final List<String> list = Arrays.asList("a", "b", "c");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
@@ -333,6 +345,7 @@ public void testNextAndPreviousIndex() {
     /**
      * Tests using the set method to change elements.
      */
+    @Test
     public void testSet() {
         final List<String> list = Arrays.asList("q", "r", "z");
         final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <q> r z