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 [7/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/ClosureUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ClosureUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.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;
+package org.apache.commons.collections4;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,11 +24,17 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionClosure;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.NOPClosure;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.ClosureUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionClosure;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.NOPClosure;
+import org.apache.commons.collections4.functors.TruePredicate;
/**
* Tests the ClosureUtils class.
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/CollectionUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.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;
+package org.apache.commons.collections4;
-import static org.apache.commons.collections.functors.EqualPredicate.equalPredicate;
+import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -26,14 +26,23 @@ import static org.junit.Assert.fail;
import java.util.*;
-import org.apache.commons.collections.bag.HashBag;
-import org.apache.commons.collections.collection.PredicatedCollection;
-import org.apache.commons.collections.collection.SynchronizedCollection;
-import org.apache.commons.collections.collection.TransformedCollection;
-import org.apache.commons.collections.collection.UnmodifiableCollection;
-import org.apache.commons.collections.functors.DefaultEquator;
-import org.apache.commons.collections.functors.Equator;
-import org.apache.commons.collections.queue.CircularFifoQueue;
+import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.ClosureUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.collection.PredicatedCollection;
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+import org.apache.commons.collections4.collection.TransformedCollection;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+import org.apache.commons.collections4.functors.DefaultEquator;
+import org.apache.commons.collections4.functors.Equator;
import org.junit.Before;
import org.junit.Test;
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/EnumerationUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.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;
+package org.apache.commons.collections4;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
import java.util.StringTokenizer;
+import org.apache.commons.collections4.EnumerationUtils;
+
import junit.framework.Test;
/**
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/FactoryUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.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;
+package org.apache.commons.collections4;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -26,8 +26,11 @@ import java.io.Serializable;
import java.util.Date;
import java.util.TimeZone;
-import org.apache.commons.collections.functors.ConstantFactory;
-import org.apache.commons.collections.functors.ExceptionFactory;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.functors.ConstantFactory;
+import org.apache.commons.collections4.functors.ExceptionFactory;
import org.junit.Test;
/**
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/IteratorUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.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;
+package org.apache.commons.collections4;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,11 +25,17 @@ import java.util.NoSuchElementException;
import junit.framework.Test;
-import org.apache.commons.collections.iterators.EmptyIterator;
-import org.apache.commons.collections.iterators.EmptyListIterator;
-import org.apache.commons.collections.iterators.EmptyMapIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedIterator;
-import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
+import org.apache.commons.collections4.IteratorUtils;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedIterator;
+import org.apache.commons.collections4.OrderedMapIterator;
+import org.apache.commons.collections4.ResettableIterator;
+import org.apache.commons.collections4.ResettableListIterator;
+import org.apache.commons.collections4.iterators.EmptyIterator;
+import org.apache.commons.collections4.iterators.EmptyListIterator;
+import org.apache.commons.collections4.iterators.EmptyMapIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedIterator;
+import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ListUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ListUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ListUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/ListUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/ListUtilsTest.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;
+package org.apache.commons.collections4;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,8 +25,12 @@ import java.util.List;
import junit.framework.Test;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.list.PredicatedList;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.list.PredicatedList;
/**
* Tests for ListUtils.
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapPerformance.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapPerformance.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapPerformance.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapPerformance.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapPerformance.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapPerformance.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapPerformance.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;
+package org.apache.commons.collections4;
import java.util.Collection;
//import java.util.Collections;
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Set;
//import java.util.TreeMap;
-import org.apache.commons.collections.map.Flat3Map;
+import org.apache.commons.collections4.map.Flat3Map;
/**
* <code>MapPerformanceTest</code> is designed to perform basic Map performance tests.
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MapUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MapUtilsTest.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;
+package org.apache.commons.collections4;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -31,12 +31,20 @@ import java.util.ArrayList;
import junit.framework.Test;
-import org.apache.commons.collections.keyvalue.DefaultKeyValue;
-import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.collections.map.LazyMap;
-import org.apache.commons.collections.map.PredicatedMap;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.IterableSortedMap;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
+import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.collections4.map.LazyMap;
+import org.apache.commons.collections4.map.PredicatedMap;
/**
* Tests for MapUtils.
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MockTestCase.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MockTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MockTestCase.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MockTestCase.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MockTestCase.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/MockTestCase.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/MockTestCase.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;
+package org.apache.commons.collections4;
import java.util.ArrayList;
import java.util.List;
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/PredicateUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java Wed Apr 17 17:37:03 2013
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
-import static org.apache.commons.collections.functors.NullPredicate.nullPredicate;
-import static org.apache.commons.collections.functors.TruePredicate.truePredicate;
+import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
+import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
@@ -30,14 +30,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.functors.AllPredicate;
-import org.apache.commons.collections.functors.AbstractPredicateTest;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionPredicate;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.NotNullPredicate;
-import org.apache.commons.collections.functors.NullPredicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.PredicateUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.functors.AbstractPredicateTest;
+import org.apache.commons.collections4.functors.AllPredicate;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionPredicate;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.NotNullPredicate;
+import org.apache.commons.collections4.functors.NullPredicate;
+import org.apache.commons.collections4.functors.TruePredicate;
import org.junit.Test;
/**
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SetUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SetUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SetUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SetUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SetUtilsTest.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;
+package org.apache.commons.collections4;
import java.util.Arrays;
import java.util.Collection;
@@ -23,7 +23,9 @@ import java.util.Set;
import junit.framework.Test;
-import org.apache.commons.collections.set.PredicatedSet;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.SetUtils;
+import org.apache.commons.collections4.set.PredicatedSet;
/**
* Tests for SetUtils.
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/SplitMapUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections;
+package org.apache.commons.collections4;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.collections.functors.NOPTransformer;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.collections.splitmap.TransformedMap;
+import org.apache.commons.collections4.IterableMap;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.Put;
+import org.apache.commons.collections4.SplitMapUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.Unmodifiable;
+import org.apache.commons.collections4.functors.NOPTransformer;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.collections4.splitmap.TransformedMap;
/**
* Tests for {@link TransformedMap}
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TestUtils.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestUtils.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TestUtils.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TestUtils.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestUtils.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestUtils.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TestUtils.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;
+package org.apache.commons.collections4;
import static org.junit.Assert.assertSame;
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TransformerUtilsTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.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;
+package org.apache.commons.collections4;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,14 +24,22 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.functors.CloneTransformer;
-import org.apache.commons.collections.functors.ConstantTransformer;
-import org.apache.commons.collections.functors.EqualPredicate;
-import org.apache.commons.collections.functors.ExceptionTransformer;
-import org.apache.commons.collections.functors.FalsePredicate;
-import org.apache.commons.collections.functors.NOPTransformer;
-import org.apache.commons.collections.functors.StringValueTransformer;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Closure;
+import org.apache.commons.collections4.ClosureUtils;
+import org.apache.commons.collections4.Factory;
+import org.apache.commons.collections4.FactoryUtils;
+import org.apache.commons.collections4.FunctorException;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.functors.CloneTransformer;
+import org.apache.commons.collections4.functors.ConstantTransformer;
+import org.apache.commons.collections4.functors.EqualPredicate;
+import org.apache.commons.collections4.functors.ExceptionTransformer;
+import org.apache.commons.collections4.functors.FalsePredicate;
+import org.apache.commons.collections4.functors.NOPTransformer;
+import org.apache.commons.collections4.functors.StringValueTransformer;
+import org.apache.commons.collections4.functors.TruePredicate;
/**
* Tests the TransformerUtils class.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.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.bag;
+package org.apache.commons.collections4.bag;
import java.io.IOException;
import java.io.Serializable;
@@ -24,11 +24,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.AbstractObjectTest;
-import org.apache.commons.collections.Bag;
+import org.apache.commons.collections4.AbstractObjectTest;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.bag.HashBag;
/**
- * Abstract test class for {@link org.apache.commons.collections.Bag Bag} methods and contracts.
+ * Abstract test class for {@link org.apache.commons.collections4.Bag Bag} methods and contracts.
* <p>
* To use, simply extend this class, and implement
* the {@link #makeObject} method.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.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.bag;
+package org.apache.commons.collections4.bag;
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.SortedBag;
/**
* Abstract test class for
- * {@link org.apache.commons.collections.SortedBag SortedBag}
+ * {@link org.apache.commons.collections4.SortedBag SortedBag}
* methods and contracts.
*
* @since 3.0
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/HashBagTest.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.bag;
+package org.apache.commons.collections4.bag;
-import org.apache.commons.collections.Bag;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.bag.HashBag;
/**
* Extension of {@link AbstractBagTest} for exercising the {@link HashBag}
@@ -37,18 +38,18 @@ public class HashBagTest<T> extends Abst
@Override
public String getCompatibilityVersion() {
- return "3";
+ return "4";
}
// public void testCreate() throws Exception {
-// Bag bag = makeBag();
-// writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/HashBag.emptyCollection.version3.obj");
-// bag = makeBag();
+// Bag bag = makeObject();
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/HashBag.emptyCollection.version4.obj");
+// bag = makeObject();
// bag.add("A");
// bag.add("A");
// bag.add("B");
// bag.add("B");
// bag.add("C");
-// writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/HashBag.fullCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/HashBag.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.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.bag;
+package org.apache.commons.collections4.bag;
import java.util.Set;
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.bag.PredicatedBag;
+import org.apache.commons.collections4.functors.TruePredicate;
/**
* Extension of {@link AbstractBagTest} for exercising the {@link PredicatedBag}
@@ -109,7 +111,7 @@ public class PredicatedBagTest<T> extend
}
try {
decorateBag(new HashBag<T>(), null);
- fail("Expectiing IllegalArgumentException for null predicate.");
+ fail("Expecting IllegalArgumentException for null predicate.");
} catch (final IllegalArgumentException e) {
// expected
}
@@ -117,19 +119,19 @@ public class PredicatedBagTest<T> extend
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
// public void testCreate() throws Exception {
-// Bag bag = makeBag();
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedBag.emptyCollection.version3.1.obj");
-// bag = makeBag();
+// Bag bag = makeObject();
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj");
+// bag = makeObject();
// bag.add("A");
// bag.add("A");
// bag.add("B");
// bag.add("B");
// bag.add("C");
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedBag.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.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.bag;
+package org.apache.commons.collections4.bag;
import java.util.Comparator;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.SortedBag;
-import org.apache.commons.collections.functors.TruePredicate;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.bag.PredicatedSortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
+import org.apache.commons.collections4.functors.TruePredicate;
/**
* Extension of {@link AbstractSortedBagTest} for exercising the {@link PredicatedSortedBag}
@@ -94,19 +96,19 @@ public class PredicatedSortedBagTest<T>
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
// public void testCreate() throws Exception {
-// Bag bag = makeBag();
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj");
-// bag = makeBag();
+// org.apache.commons.collections4.Bag bag = makeObject();
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj");
+// bag = makeObject();
// bag.add("A");
// bag.add("A");
// bag.add("B");
// bag.add("B");
// bag.add("C");
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/PredicatedSortedBag.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.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.bag;
+package org.apache.commons.collections4.bag;
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.bag.HashBag;
+import org.apache.commons.collections4.bag.TransformedBag;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
/**
* Extension of {@link AbstractBagTest} for exercising the {@link TransformedBag}
@@ -79,19 +81,19 @@ public class TransformedBagTest<T> exten
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
// public void testCreate() throws Exception {
-// Bag bag = makeBag();
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedBag.emptyCollection.version3.1.obj");
-// bag = makeBag();
+// Bag bag = makeObject();
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj");
+// bag = makeObject();
// bag.add("A");
// bag.add("A");
// bag.add("B");
// bag.add("B");
// bag.add("C");
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedBag.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedBag.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java Wed Apr 17 17:37:03 2013
@@ -14,12 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.SortedBag;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.bag.TransformedBag;
+import org.apache.commons.collections4.bag.TransformedSortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
+import org.apache.commons.collections4.collection.TransformedCollectionTest;
/**
* Extension of {@link AbstractSortedBagTest} for exercising the {@link TransformedSortedBag}
@@ -72,19 +75,19 @@ public class TransformedSortedBagTest<T>
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
// public void testCreate() throws Exception {
-// Bag bag = makeBag();
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedSortedBag.emptyCollection.version3.1.obj");
-// bag = makeBag();
+// Bag bag = makeObject();
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj");
+// bag = makeObject();
// bag.add("A");
// bag.add("A");
// bag.add("B");
// bag.add("B");
// bag.add("C");
-// writeExternalFormToDisk((java.io.Serializable) bag, "D:/dev/collections/data/test/TransformedSortedBag.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java Wed Apr 17 17:37:03 2013
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bag;
+package org.apache.commons.collections4.bag;
-import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections4.Bag;
+import org.apache.commons.collections4.SortedBag;
+import org.apache.commons.collections4.bag.TreeBag;
/**
* Extension of {@link AbstractBagTest} for exercising the {@link TreeBag}
@@ -68,18 +69,18 @@ public class TreeBagTest<T> extends Abst
@Override
public String getCompatibilityVersion() {
- return "3";
+ return "4";
}
- // public void testCreate() throws Exception {
- // Bag bag = makeBag();
- // writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/TreeBag.emptyCollection.version3.obj");
- // bag = makeBag();
- // bag.add("A");
- // bag.add("A");
- // bag.add("B");
- // bag.add("B");
- // bag.add("C");
- // writeExternalFormToDisk((Serializable) bag, "D:/dev/collections/data/test/TreeBag.fullCollection.version3.obj");
- // }
+// public void testCreate() throws Exception {
+// Bag bag = makeObject();
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TreeBag.emptyCollection.version4.obj");
+// bag = makeObject();
+// bag.add("A");
+// bag.add("A");
+// bag.add("B");
+// bag.add("B");
+// bag.add("C");
+// writeExternalFormToDisk((java.io.Serializable) bag, "src/test/resources/data/test/TreeBag.fullCollection.version4.obj");
+// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.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.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.Collection;
import java.util.HashMap;
@@ -22,11 +22,11 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
-import org.apache.commons.collections.map.AbstractIterableMapTest;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
+import org.apache.commons.collections4.map.AbstractIterableMapTest;
/**
* Abstract test class for {@link BidiMap} methods and contracts.
@@ -73,7 +73,7 @@ public abstract class AbstractBidiMapTes
*/
@Override
public String getCompatibilityVersion() {
- return "3";
+ return "4";
}
// BidiPut
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.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.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.commons.collections.OrderedBidiMap;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.bidimap.AbstractOrderedBidiMapDecorator;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
/**
* Test class for AbstractOrderedBidiMapDecorator.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.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.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,10 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.OrderedBidiMap;
-import org.apache.commons.collections.iterators.AbstractMapIteratorTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.MapIterator;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.iterators.AbstractMapIteratorTest;
/**
* Abstract test class for {@link OrderedBidiMap} methods and contracts.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.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.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.ArrayList;
import java.util.Collections;
@@ -27,9 +27,9 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.SortedBidiMap;
-import org.apache.commons.collections.map.AbstractSortedMapTest;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.map.AbstractSortedMapTest;
/**
* Abstract test class for {@link SortedBidiMap} methods and contracts.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
/**
* JUnit tests.
@@ -52,8 +54,8 @@ public class DualHashBidiMapTest<K, V> e
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualHashBidiMap.emptyCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualHashBidiMap.fullCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualLinkedHashBidiMap;
/**
* JUnit tests.
@@ -57,8 +59,8 @@ public class DualLinkedHashBidiMapTest<K
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.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.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -28,10 +28,12 @@ import java.util.List;
import java.util.TreeMap;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.SortedBidiMap;
-import org.apache.commons.collections.comparators.ComparableComparator;
-import org.apache.commons.collections.comparators.ReverseComparator;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
+import org.apache.commons.collections4.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ReverseComparator;
/**
* JUnit tests.
@@ -144,7 +146,7 @@ public class DualTreeBidiMap2Test<K exte
@Override
public String getCompatibilityVersion() {
- return "3.Test2";
+ return "4.Test2";
}
/**
@@ -157,8 +159,8 @@ public class DualTreeBidiMap2Test<K exte
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.emptyCollection.version3.Test2.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.fullCollection.version3.Test2.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
/**
* JUnit tests.
@@ -52,8 +54,8 @@ public class DualTreeBidiMapTest<K exten
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.emptyCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((Serializable) map, "D:/dev/collections/data/test/DualTreeBidiMap.fullCollection.version3.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.TreeMap;
import junit.framework.Test;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.TreeBidiMap;
/**
* JUnit tests.
@@ -72,14 +73,14 @@ public class TreeBidiMapTest<K extends C
@Override
public String getCompatibilityVersion() {
- return "3.3";
+ return "4";
}
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) map, "/tmp/TreeBidiMap.emptyCollection.version3.3.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/TreeBidiMap.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) map, "/tmp/TreeBidiMap.fullCollection.version3.3.obj");
+// writeExternalFormToDisk((java.io.Serializable) map, "src/test/resources/data/test/TreeBidiMap.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.HashMap;
import java.util.Map;
import junit.framework.Test;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.bidimap.UnmodifiableBidiMap;
/**
* JUnit tests.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,15 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.Map;
import java.util.TreeMap;
import junit.framework.Test;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.OrderedBidiMap;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.OrderedBidiMap;
+import org.apache.commons.collections4.bidimap.TreeBidiMap;
+import org.apache.commons.collections4.bidimap.UnmodifiableOrderedBidiMap;
/**
* JUnit tests.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java Wed Apr 17 17:37:03 2013
@@ -14,14 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.bidimap;
+package org.apache.commons.collections4.bidimap;
import java.util.SortedMap;
import java.util.TreeMap;
import junit.framework.Test;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.SortedBidiMap;
+
+import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.SortedBidiMap;
+import org.apache.commons.collections4.bidimap.DualTreeBidiMap;
+import org.apache.commons.collections4.bidimap.UnmodifiableSortedBidiMap;
/**
* JUnit tests.
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
/**
* Abstract test class for {@link java.util.Collection} methods and contracts.
@@ -90,7 +90,7 @@ import org.apache.commons.collections.Ab
* {@link #confirmed}, the {@link #verify()} method is invoked to compare
* the results. You may want to override {@link #verify()} to perform
* additional verifications. For instance, when testing the collection
- * views of a map, {@link org.apache.commons.collections.map.AbstractMapTest AbstractTestMap}
+ * views of a map, {@link org.apache.commons.collections4.map.AbstractMapTest AbstractTestMap}
* would override {@link #verify()} to make
* sure the map is changed after the collection view is changed.
* <p>
@@ -104,9 +104,9 @@ import org.apache.commons.collections.Ab
* Those methods should provide a confirmed collection implementation
* that's compatible with your collection implementation.
* <p>
- * If you're extending {@link org.apache.commons.collections.list.AbstractListTest AbstractListTest},
- * {@link org.apache.commons.collections.set.AbstractSetTest AbstractTestSet},
- * or {@link org.apache.commons.collections.bag.AbstractBagTest AbstractBagTest},
+ * If you're extending {@link org.apache.commons.collections4.list.AbstractListTest AbstractListTest},
+ * {@link org.apache.commons.collections4.set.AbstractSetTest AbstractTestSet},
+ * or {@link org.apache.commons.collections4.bag.AbstractBagTest AbstractBagTest},
* you probably don't have to worry about the
* above methods, because those three classes already override the methods
* to provide standard JDK confirmed collections.<P>
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.util.ArrayList;
import java.util.Arrays;
@@ -23,6 +23,8 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.collections4.collection.CompositeCollection;
+
/**
* Extension of {@link AbstractCollectionTest} for exercising the
* {@link CompositeCollection} implementation.
@@ -371,14 +373,14 @@ public class CompositeCollectionTest<E>
@Override
public String getCompatibilityVersion() {
- return "3.3";
+ return "4";
}
// public void testCreate() throws Exception {
// resetEmpty();
-// writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeCollection.emptyCollection.version3.3.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "/tmp/CompositeCollection.fullCollection.version3.3.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import static java.util.Arrays.asList;
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.collection.IndexedCollection;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.collection.IndexedCollection;
/**
* Extension of {@link AbstractCollectionTest} for exercising the
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
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.collection.PredicatedCollection;
+import org.apache.commons.collections4.functors.TruePredicate;
/**
* Extension of {@link AbstractCollectionTest} for exercising the
@@ -123,14 +124,14 @@ public class PredicatedCollectionTest<E>
@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/PredicatedCollection.emptyCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/PredicatedCollection.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+
/**
* Extension of {@link AbstractCollectionTest} for exercising the
* {@link SynchronizedCollection} implementation.
@@ -53,14 +55,14 @@ public class SynchronizedCollectionTest<
@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/SynchronizedCollection.emptyCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/SynchronizedCollection.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.TransformerUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.TransformerUtils;
+import org.apache.commons.collections4.collection.TransformedCollection;
/**
* Extension of {@link AbstractCollectionTest} for exercising the {@link TransformedCollection}
@@ -116,14 +117,14 @@ public class TransformedCollectionTest e
@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/TransformedCollection.emptyCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/TransformedCollection.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj");
// }
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.commons.collections.BoundedCollection;
-import org.apache.commons.collections.list.FixedSizeList;
+import org.apache.commons.collections4.BoundedCollection;
+import org.apache.commons.collections4.collection.UnmodifiableBoundedCollection;
+import org.apache.commons.collections4.list.FixedSizeList;
/**
* Extension of {@link AbstractCollectionTest} for exercising the
@@ -78,6 +79,6 @@ public class UnmodifiableBoundedCollecti
@Override
public String getCompatibilityVersion() {
- return "3.1";
+ return "4";
}
}
Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java?rev=1469004&r1=1468597&r2=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.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.collection;
+package org.apache.commons.collections4.collection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import org.apache.commons.collections4.collection.UnmodifiableCollection;
+
/**
* Extension of {@link AbstractCollectionTest} for exercising the
* {@link UnmodifiableCollection} implementation.
@@ -71,14 +73,14 @@ public class UnmodifiableCollectionTest<
@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/UnmodifiableCollection.emptyCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj");
// resetFull();
-// writeExternalFormToDisk((java.io.Serializable) collection, "D:/dev/collections/data/test/UnmodifiableCollection.fullCollection.version3.1.obj");
+// writeExternalFormToDisk((java.io.Serializable) getCollection(), "src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj");
// }
}
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.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.FileNotFoundException;
import java.io.IOException;
@@ -24,7 +24,7 @@ import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.collections.AbstractObjectTest;
+import org.apache.commons.collections4.AbstractObjectTest;
import org.junit.Test;
/**
@@ -78,15 +78,6 @@ public abstract class AbstractComparator
return false;
}
- /**
- * Overrides superclass to set the compatability to version 2
- * as there were no Comparators in version 1.x.
- */
- @Override
- public String getCompatibilityVersion() {
- return "2";
- }
-
//-----------------------------------------------------------------------
/**
* Reverse the list.
Copied: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java (from r1468597, commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java?p2=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java&p1=commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java&r1=1468597&r2=1469004&rev=1469004&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/comparators/AbstractNullComparatorTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.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.NullComparator;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -71,6 +73,16 @@ public abstract class AbstractNullCompar
public String getCanonicalComparatorName(final Object object) {
return super.getCanonicalComparatorName(object) + "1";
}
+
+ @Override
+ public String getCompatibilityVersion() {
+ return "4";
+ }
+
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/NullComparator.version4.obj1");
+// }
+
}
/**
@@ -103,5 +115,15 @@ public abstract class AbstractNullCompar
public String getCanonicalComparatorName(final Object object) {
return super.getCanonicalComparatorName(object) + "2";
}
+
+ @Override
+ public String getCompatibilityVersion() {
+ return "4";
+ }
+
+// public void testCreate() throws Exception {
+// writeExternalFormToDisk((java.io.Serializable) makeObject(), "src/test/resources/data/test/NullComparator.version4.obj2");
+// }
+
}
}