You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/04/17 19:38:18 UTC
svn commit: r1469004 [8/11] - in /commons/proper/collections/trunk: ./
src/main/java/org/apache/commons/collections/
src/main/java/org/apache/commons/collections/bag/
src/main/java/org/apache/commons/collections/bidimap/
src/main/java/org/apache/common...
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/BooleanComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
+import org.apache.commons.collections4.comparators.BooleanComparator;
import org.junit.Test;
/**
@@ -59,9 +60,13 @@ public class BooleanComparatorTest exten
@Override
public String getCompatibilityVersion() {
- return "3";
+ return "4";
}
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/BooleanComparator.version4.obj");
+// }
+
// tests
// ------------------------------------------------------------------------
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ComparableComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+
/**
* Tests for ComparableComparator.
*
@@ -49,4 +51,13 @@ public class ComparableComparatorTest ex
return list;
}
+ @Override
+ public String getCompatibilityVersion() {
+ return "4";
+ }
+
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ComparableComparator.version4.obj");
+// }
+
}
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ComparatorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
import java.io.Serializable;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparatorChain;
import org.junit.Test;
/**
@@ -42,6 +44,15 @@ public class ComparatorChainTest extends
return chain;
}
+ @Override
+ public String getCompatibilityVersion() {
+ return "4";
+ }
+
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ComparatorChain.version4.obj");
+// }
+
@Test
public void testNoopComparatorChain() {
final ComparatorChain<Integer> chain = new ComparatorChain<Integer>();
@@ -128,7 +139,6 @@ public class ComparatorChainTest extends
return list;
}
- @SuppressWarnings("serial")
public static class PseudoRow implements Serializable {
/**
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/FixedOrderComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/FixedOrderComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/FixedOrderComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
import java.util.Arrays;
import java.util.Comparator;
@@ -22,6 +22,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Random;
+import org.apache.commons.collections4.comparators.FixedOrderComparator;
import org.junit.Test;
/**
@@ -75,6 +76,10 @@ public class FixedOrderComparatorTest ex
return "4";
}
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/FixedOrderComparator.version4.obj");
+// }
+
//
// The tests
//
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/ReverseComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,6 +25,8 @@ import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ReverseComparator;
import org.junit.Test;
/**
@@ -54,6 +56,15 @@ public class ReverseComparatorTest exten
}
@Override
+ public String getCompatibilityVersion() {
+ return "4";
+ }
+
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/ReverseComparator.version4.obj");
+// }
+
+ @Override
public List<Integer> getComparableObjectsOrdered() {
final List<Integer> list = new LinkedList<Integer>();
list.add(new Integer(1));
@@ -67,7 +78,7 @@ public class ReverseComparatorTest exten
/**
* Override this inherited test since Collections.reverseOrder
* doesn't adhere to the "soft" Comparator contract, and we've
- * already "cannonized" the comparator returned by makeComparator.
+ * already "canonized" the comparator returned by makeComparator.
*/
@Override
@SuppressWarnings("unchecked")
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/TransformingComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.collections4.comparators;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.collections.ComparatorUtils;
-import org.apache.commons.collections.TransformerUtils;
+import org.apache.commons.collections4.ComparatorUtils;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.comparators.ComparableComparator;
/**
* Test class for TransformingComparator.
@@ -64,6 +65,10 @@ public class TransformingComparatorTest
return "4";
}
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/TransformingComparator.version4.obj");
+// }
+
//
// The tests
//
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/sequence/SequencesComparatorTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators.sequence;
+package org.apache.commons.collections4.comparators.sequence;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
+import org.apache.commons.collections4.comparators.sequence.CommandVisitor;
+import org.apache.commons.collections4.comparators.sequence.SequencesComparator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
+
+import org.apache.commons.collections4.Predicate;
-import org.apache.commons.collections.Predicate;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractClosureTest.java Wed Apr 17 17:37:03 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
-import org.apache.commons.collections.Closure;
+import org.apache.commons.collections4.Closure;
import org.junit.Assert;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import org.junit.Assert;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
import static org.easymock.EasyMock.verify;
import static org.easymock.EasyMock.replay;
import org.junit.Before;
import org.junit.After;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import org.easymock.EasyMock;
import java.util.ArrayList;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AbstractPredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.AllPredicate;
-import static org.apache.commons.collections.functors.AllPredicate.allPredicate;
+import static org.apache.commons.collections4.functors.AllPredicate.allPredicate;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/CatchAndRethrowClosureTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
import java.io.IOException;
-import org.apache.commons.collections.Closure;
-import org.apache.commons.collections.FunctorException;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.functors.CatchAndRethrowClosure;
import org.junit.Assert;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
+
+import static org.apache.commons.collections4.functors.ComparatorPredicate.*;
-import static org.apache.commons.collections.functors.ComparatorPredicate.*;
import java.util.Comparator;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
-import static org.apache.commons.collections.functors.EqualPredicate.equalPredicate;
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
import static org.junit.Assert.assertSame;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.functors;
+package org.apache.commons.collections4.functors;
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
import static org.junit.Assert.assertSame;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.NullPredicate;
import org.junit.Test;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
/**
* Abstract class for testing the Iterator interface.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.ListIterator;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.HashSet;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.commons.collections.MapIterator;
+import org.apache.commons.collections4.MapIterator;
/**
* Abstract class for testing the MapIterator interface.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.HashSet;
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.commons.collections.OrderedMapIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
/**
* Abstract class for testing the OrderedMapIterator interface.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.ArrayIterator;
+
/**
* Tests the ArrayIterator with primitive type arrays.
*
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.ArrayIterator;
+
/**
* Tests the ArrayIterator to ensure that the next() method will actually
* perform the iteration rather than the hasNext() method.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
+
+import org.apache.commons.collections4.iterators.ArrayListIterator;
/**
* Test the ArrayListIterator class with primitives.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Arrays;
import java.util.ListIterator;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.ArrayListIterator;
+
/**
* Test the ArrayListIterator class.
*
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import org.apache.commons.collections.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.iterators.CollatingIterator;
/**
* Unit test suite for {@link CollatingIterator}.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
-import static org.apache.commons.collections.functors.TruePredicate.truePredicate;
+import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,8 +25,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.NotNullPredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.NotNullPredicate;
+import org.apache.commons.collections4.iterators.ArrayIterator;
+import org.apache.commons.collections4.iterators.FilterIterator;
/**
* Test the filter iterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,9 +23,10 @@ import java.util.ListIterator;
import java.util.Random;
import junit.framework.TestCase;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.PredicateUtils;
-import org.apache.commons.collections.list.GrowthList;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.iterators.FilterListIterator;
+import org.apache.commons.collections4.list.GrowthList;
import org.junit.Assert;
/**
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java Wed Apr 17 17:37:03 2013
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.iterators.IteratorChain;
/**
* Tests the IteratorChain class.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java Wed Apr 17 17:37:03 2013
@@ -11,7 +11,7 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Iterator;
@@ -19,7 +19,8 @@ import java.util.List;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.iterators.IteratorIterable;
/**
* Tests for IteratorIterable.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java Wed Apr 17 17:37:03 2013
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.iterators.LazyIteratorChain;
/**
* Tests the LazyIteratorChain class.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.ListIteratorWrapper;
/**
* Tests the ListIteratorWrapper to insure that it behaves as expected when wrapping a ListIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.ListIteratorWrapper;
/**
* Tests the ListIteratorWrapper to insure that it simulates
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.LoopingIterator;
+
import junit.framework.TestCase;
/**
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.LoopingListIterator;
+
import junit.framework.TestCase;
/**
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
+
+import org.apache.commons.collections4.iterators.NodeListIterator;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.ObjectArrayIterator;
+
/**
* Tests the ObjectArrayIterator.
*
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
+
+import org.apache.commons.collections4.iterators.ObjectArrayListIterator;
/**
* Tests the ObjectArrayListIterator class.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Arrays;
import java.util.ListIterator;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.ObjectArrayListIterator;
+
/**
* Tests the ObjectArrayListIterator class.
*
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.iterators.ObjectGraphIterator;
/**
* Testcase.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.ReverseListIterator;
/**
* Tests the ReverseListIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
/**
* Tests the SingletonIterator to ensure that the next() method will actually
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ResettableIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.iterators.SingletonIterator;
/**
* Tests the SingletonIterator to ensure that the next() method will actually
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ListIterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ResettableListIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.SingletonListIterator;
/**
* Tests the SingletonListIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.collections4.iterators.UniqueFilterIterator;
+
/**
* Tests the UniqueFilterIterator class.
*
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableIterator;
/**
* Tests the UnmodifiableIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.ArrayList;
import java.util.Arrays;
@@ -22,7 +22,8 @@ import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableListIterator;
/**
* Tests the UnmodifiableListIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.iterators.UnmodifiableMapIterator;
/**
* Tests the UnmodifiableMapIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java Wed Apr 17 17:37:03 2013
@@ -14,16 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.iterators;
+package org.apache.commons.collections4.iterators;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.collections.OrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import org.apache.commons.collections.Unmodifiable;
-import org.apache.commons.collections.map.ListOrderedMap;
+import org.apache.commons.collections4.OrderedMap;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.iterators.UnmodifiableOrderedMapIterator;
+import org.apache.commons.collections4.map.ListOrderedMap;
/**
* Tests the UnmodifiableOrderedMapIterator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
import java.util.HashMap;
import java.util.Map;
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+
import junit.framework.TestCase;
/**
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
import java.util.Map;
-import org.apache.commons.collections.KeyValue;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
/**
* Test the DefaultMapEntry class.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,10 +26,12 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.collections4.keyvalue.MultiKey;
+
import junit.framework.TestCase;
/**
- * Unit tests for {@link org.apache.commons.collections.keyvalue.MultiKey}.
+ * Unit tests for {@link org.apache.commons.collections4.keyvalue.MultiKey}.
*
* @version $Id$
*/
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java Wed Apr 17 17:37:03 2013
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.collections4.keyvalue.TiedMapEntry;
+
/**
* Test the TiedMapEntry class.
*
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.keyvalue;
+package org.apache.commons.collections4.keyvalue;
import java.util.Map;
-import org.apache.commons.collections.KeyValue;
-import org.apache.commons.collections.Unmodifiable;
+import org.apache.commons.collections4.KeyValue;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.UnmodifiableMapEntry;
/**
* Test the UnmodifiableMapEntry class.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java Wed Apr 17 17:37:03 2013
@@ -14,18 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.util.Arrays;
+import org.apache.commons.collections4.list.AbstractLinkedList;
+
/**
* Test case for {@link AbstractLinkedList}.
*
- * @version $Revision$
- *
- * @author Rich Dougherty
+ * @version $Id$
* @author David Hay
- * @author Phil Steitz
*/
public abstract class AbstractLinkedListTest<E> extends AbstractListTest<E> {
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.io.IOException;
import java.io.Serializable;
@@ -31,9 +31,9 @@ import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.collection.AbstractCollectionTest;
-import org.apache.commons.collections.iterators.AbstractListIteratorTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.collection.AbstractCollectionTest;
+import org.apache.commons.collections4.iterators.AbstractListIteratorTest;
/**
* Abstract test class for {@link java.util.List} methods and contracts.
@@ -46,12 +46,7 @@ import org.apache.commons.collections.it
* test case (method) your {@link List} fails or override one of the
* protected methods from AbstractTestCollection.
*
- * @version $Revision$
- *
- * @author Rodney Waldhoff
- * @author Paul Jack
- * @author Stephen Colebourne
- * @author Neil O'Toole
+ * @version $Id$
*/
public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
@@ -1075,18 +1070,6 @@ public abstract class AbstractListTest<E
}
/**
- * Skip the serialized canonical tests for now.
- *
- * @return true
- *
- * TODO: store new serialized objects in CVS.
- */
- @Override
- protected boolean skipSerializedCanonicalTests() {
- return true;
- }
-
- /**
* Compare the current serialized form of the List
* against the canonical version in SVN.
*/
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java Wed Apr 17 17:37:03 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.util.ArrayList;
import java.util.ConcurrentModificationException;
@@ -26,15 +26,13 @@ import java.util.NoSuchElementException;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.list.CursorableLinkedList;
/**
* Test class.
*
- * @version $Revision$
- *
- * @author Rodney Waldhoff
- * @author Simon Kitching
+ * @version $Id$
*/
public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
public CursorableLinkedListTest(final String testName) {
@@ -1525,14 +1523,14 @@ public class CursorableLinkedListTest<E>
@Override
public String getCompatibilityVersion() {
- return "4.0";
+ return "4";
}
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.emptyCollection.version4.0.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/CursorableLinkedList.fullCollection.version4.0.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java Wed Apr 17 17:37:03 2013
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.commons.collections4.list.FixedSizeList;
+
/**
* Extension of {@link AbstractListTest} for exercising the {@link FixedSizeList}
* implementation.
*
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.0
+ * @version $Id$
*/
public class FixedSizeListTest<E> extends AbstractListTest<E> {
@@ -59,14 +59,14 @@ public class FixedSizeListTest<E> extend
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/FixedSizeList.emptyCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/FixedSizeList.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java Wed Apr 17 17:37:03 2013
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import org.apache.commons.collections4.list.GrowthList;
+
/**
* Extension of {@link AbstractListTest} for exercising the {@link GrowthList}.
*
- * @since Commons Collections 3.2
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @since 3.2
+ * @version $Id$
*/
public class GrowthListTest<E> extends AbstractListTest<E> {
@@ -158,14 +158,14 @@ public class GrowthListTest<E> extends A
//-----------------------------------------------------------------------
@Override
public String getCompatibilityVersion() {
- return "3.2";
+ return "4";
}
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/GrowthList.emptyCollection.version3.2.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/GrowthList.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "C:/commons/collections/data/test/GrowthList.fullCollection.version3.2.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/GrowthList.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java Wed Apr 17 17:37:03 2013
@@ -14,22 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.util.Arrays;
import java.util.LinkedList;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.list.NodeCachingLinkedList;
/**
* Test class for NodeCachingLinkedList, a performance optimised LinkedList.
*
- * @version $Revision$
- *
- * @author Jeff Varszegi
- * @author Phil Steitz
+ * @version $Id$
*/
public class NodeCachingLinkedListTest<E> extends AbstractLinkedListTest<E> {
@@ -49,7 +47,7 @@ public class NodeCachingLinkedListTest<E
@Override
public String getCompatibilityVersion() {
- return "3";
+ return "4";
}
//-----------------------------------------------------------------------
@@ -145,11 +143,11 @@ public class NodeCachingLinkedListTest<E
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) collection,
-// "D:/dev/collections/data/test/NodeCachingLinkedList.emptyCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(),
+// "src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection,
-// "D:/dev/collections/data/test/NodeCachingLinkedList.fullCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(),
+// "src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj");
// }
/**
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java Wed Apr 17 17:37:03 2013
@@ -14,22 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.list;
+package org.apache.commons.collections4.list;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.TruePredicate;
+import org.apache.commons.collections4.list.PredicatedList;
/**
* Extension of {@link AbstractListTest} for exercising the
* {@link PredicatedList} implementation.
*
- * @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Phil Steitz
+ * @since 3.0
+ * @version $Id$
*/
public class PredicatedListTest<E> extends AbstractListTest<E> {
@@ -139,14 +138,14 @@ public class PredicatedListTest<E> exten
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedList.emptyCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedList.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedList.fullCollection.version4.obj");
// }
}