[commons-collections] branch master updated: Move test fixtures to component specific folder.

ggregory Thu, 21 May 2020 08:38:10 -0700

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git



The following commit(s) were added to refs/heads/master by this push:
     new a9dd82f  Move test fixtures to component specific folder.
a9dd82f is described below

commit a9dd82f83e751022d1a7f8e6fde246d9082aeca5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu May 21 11:37:07 2020 -0400

    Move test fixtures to component specific folder.
---
 pom.xml                                                  |   2 +-
 .../apache/commons/collections4/AbstractObjectTest.java  |  15 +++++++--------
 .../java/org/apache/commons/collections4/BulkTest.java   |  13 ++++---------
 .../apache/commons/collections4/bag/AbstractBagTest.java |   4 ++--
 .../commons/collections4/bag/CollectionBagTest.java      |   8 ++++----
 .../collections4/bag/CollectionSortedBagTest.java        |   4 ++--
 .../collections4/comparators/AbstractComparatorTest.java |   2 +-
 .../collections4/comparators/ReverseComparatorTest.java  |   2 +-
 .../commons/collections4/list/AbstractListTest.java      |   4 ++--
 .../apache/commons/collections4/map/AbstractMapTest.java |   4 ++--
 .../collections4/multiset/AbstractMultiSetTest.java      |   4 ++--
 .../properties/AbstractPropertiesFactoryTest.java        |   5 +++--
 .../commons/collections4/queue/AbstractQueueTest.java    |   4 ++--
 .../collections4/queue/SynchronizedQueueTest.java        |  12 ++++++------
 .../collections4/set/PredicatedSortedSetTest.java        |   3 ---
 ...ArrayListValuedHashMap.emptyCollection.version4.1.obj | Bin
 .../ArrayListValuedHashMap.fullCollection.version4.1.obj | Bin
 .../data/test/ArrayStack.emptyCollection.version4.obj    | Bin
 .../data/test/ArrayStack.fullCollection.version4.obj     | Bin
 .../data/test/BooleanComparator.version4.obj             | Bin
 .../test/CaseInsensitiveMap.emptyCollection.version4.obj | Bin
 .../test/CaseInsensitiveMap.fullCollection.version4.obj  | Bin
 .../test/CircularFifoQueue.emptyCollection.version4.obj  | Bin
 .../test/CircularFifoQueue.fullCollection.version4.obj   | Bin
 .../data/test/CollectionBag.emptyCollection.version4.obj | Bin
 .../data/test/CollectionBag.fullCollection.version4.obj  | Bin
 .../CollectionSortedBag.emptyCollection.version4.obj     | Bin
 .../test/CollectionSortedBag.fullCollection.version4.obj | Bin
 .../data/test/ComparableComparator.version4.obj          | Bin
 .../collections4}/data/test/ComparatorChain.version4.obj | Bin
 .../CompositeCollection.emptyCollection.version4.obj     | Bin
 .../test/CompositeCollection.fullCollection.version4.obj | Bin
 .../data/test/CompositeMap.emptyCollection.version4.obj  | Bin
 .../data/test/CompositeMap.fullCollection.version4.obj   | Bin
 .../data/test/CompositeSet.emptyCollection.version4.obj  | Bin
 .../data/test/CompositeSet.fullCollection.version4.obj   | Bin
 .../CursorableLinkedList.emptyCollection.version4.obj    | Bin
 .../CursorableLinkedList.fullCollection.version4.obj     | Bin
 .../data/test/DefaultedMap.emptyCollection.version4.obj  | Bin
 .../data/test/DefaultedMap.fullCollection.version4.obj   | Bin
 .../test/DualHashBidiMap.emptyCollection.version4.obj    | Bin
 .../test/DualHashBidiMap.fullCollection.version4.obj     | Bin
 .../DualLinkedHashBidiMap.emptyCollection.version4.obj   | Bin
 .../DualLinkedHashBidiMap.fullCollection.version4.obj    | Bin
 .../DualTreeBidiMap.emptyCollection.version4.Test2.obj   | Bin
 .../test/DualTreeBidiMap.emptyCollection.version4.obj    | Bin
 .../DualTreeBidiMap.fullCollection.version4.Test2.obj    | Bin
 .../test/DualTreeBidiMap.fullCollection.version4.obj     | Bin
 .../data/test/FixedOrderComparator.version4.obj          | Bin
 .../data/test/FixedSizeList.emptyCollection.version4.obj | Bin
 .../data/test/FixedSizeList.fullCollection.version4.obj  | Bin
 .../data/test/FixedSizeMap.emptyCollection.version4.obj  | Bin
 .../data/test/FixedSizeMap.fullCollection.version4.obj   | Bin
 .../test/FixedSizeSortedMap.emptyCollection.version4.obj | Bin
 .../test/FixedSizeSortedMap.fullCollection.version4.obj  | Bin
 .../data/test/Flat3Map.emptyCollection.version4.obj      | Bin
 .../data/test/Flat3Map.fullCollection.version4.obj       | Bin
 .../data/test/GrowthList.emptyCollection.version4.obj    | Bin
 .../data/test/GrowthList.fullCollection.version4.obj     | Bin
 .../data/test/HashBag.emptyCollection.version4.obj       | Bin
 .../data/test/HashBag.fullCollection.version4.obj        | Bin
 .../test/HashMultiSet.emptyCollection.version4.1.obj     | Bin
 .../data/test/HashMultiSet.fullCollection.version4.1.obj | Bin
 .../HashSetValuedHashMap.emptyCollection.version4.1.obj  | Bin
 .../HashSetValuedHashMap.fullCollection.version4.1.obj   | Bin
 .../data/test/HashedMap.emptyCollection.version4.obj     | Bin
 .../data/test/HashedMap.fullCollection.version4.obj      | Bin
 .../data/test/LRUMap.emptyCollection.version4.obj        | Bin
 .../data/test/LRUMap.fullCollection.version4.obj         | Bin
 .../data/test/LazyMap.emptyCollection.version4.obj       | Bin
 .../data/test/LazyMap.fullCollection.version4.obj        | Bin
 .../data/test/LazySortedMap.emptyCollection.version4.obj | Bin
 .../data/test/LazySortedMap.fullCollection.version4.obj  | Bin
 .../data/test/LinkedMap.emptyCollection.version4.obj     | Bin
 .../data/test/LinkedMap.fullCollection.version4.obj      | Bin
 .../test/ListOrderedMap.emptyCollection.version4.obj     | Bin
 .../data/test/ListOrderedMap.fullCollection.version4.obj | Bin
 .../test/ListOrderedSet.emptyCollection.version4.obj     | Bin
 .../data/test/ListOrderedSet.fullCollection.version4.obj | Bin
 .../data/test/MapBackedSet.emptyCollection.version4.obj  | Bin
 .../data/test/MapBackedSet.fullCollection.version4.obj   | Bin
 .../data/test/MultiKeyMap.emptyCollection.version4.obj   | Bin
 .../data/test/MultiKeyMap.fullCollection.version4.obj    | Bin
 .../data/test/MultiValueMap.emptyCollection.version4.obj | Bin
 .../data/test/MultiValueMap.fullCollection.version4.obj  | Bin
 .../MultiValuedHashMap.emptyCollection.version4.1.obj    | Bin
 .../MultiValuedHashMap.fullCollection.version4.1.obj     | Bin
 ...ltiValuedLinkedHashMap.emptyCollection.version4.1.obj | Bin
 ...ultiValuedLinkedHashMap.fullCollection.version4.1.obj | Bin
 .../NodeCachingLinkedList.emptyCollection.version4.obj   | Bin
 .../NodeCachingLinkedList.fullCollection.version4.obj    | Bin
 .../collections4}/data/test/NullComparator.version4.obj1 | Bin
 .../collections4}/data/test/NullComparator.version4.obj2 | Bin
 .../test/PassiveExpiringMap.emptyCollection.version4.obj | Bin
 .../test/PassiveExpiringMap.fullCollection.version4.obj  | Bin
 .../data/test/PatriciaTrie.emptyCollection.version4.obj  | Bin
 .../data/test/PatriciaTrie.fullCollection.version4.obj   | Bin
 .../data/test/PredicatedBag.emptyCollection.version4.obj | Bin
 .../data/test/PredicatedBag.fullCollection.version4.obj  | Bin
 .../PredicatedCollection.emptyCollection.version4.obj    | Bin
 .../PredicatedCollection.fullCollection.version4.obj     | Bin
 .../test/PredicatedList.emptyCollection.version4.obj     | Bin
 .../data/test/PredicatedList.fullCollection.version4.obj | Bin
 .../data/test/PredicatedMap.emptyCollection.version4.obj | Bin
 .../data/test/PredicatedMap.fullCollection.version4.obj  | Bin
 .../PredicatedMultiSet.emptyCollection.version4.1.obj    | Bin
 .../PredicatedMultiSet.fullCollection.version4.1.obj     | Bin
 ...PredicatedNavigableSet.emptyCollection.version4.1.obj | Bin
 .../PredicatedNavigableSet.fullCollection.version4.1.obj | Bin
 .../test/PredicatedQueue.emptyCollection.version4.obj    | Bin
 .../test/PredicatedQueue.fullCollection.version4.obj     | Bin
 .../data/test/PredicatedSet.emptyCollection.version4.obj | Bin
 .../data/test/PredicatedSet.fullCollection.version4.obj  | Bin
 .../PredicatedSortedBag.emptyCollection.version4.obj     | Bin
 .../test/PredicatedSortedBag.fullCollection.version4.obj | Bin
 .../PredicatedSortedMap.emptyCollection.version4.obj     | Bin
 .../test/PredicatedSortedMap.fullCollection.version4.obj | Bin
 .../PredicatedSortedSet.emptyCollection.version4.obj     | Bin
 .../test/PredicatedSortedSet.fullCollection.version4.obj | Bin
 .../ReferenceIdentityMap.emptyCollection.version4.obj    | Bin
 .../ReferenceIdentityMap.fullCollection.version4.obj     | Bin
 .../data/test/ReferenceMap.emptyCollection.version4.obj  | Bin
 .../data/test/ReferenceMap.fullCollection.version4.obj   | Bin
 .../data/test/ReverseComparator.version4.obj             | Bin
 .../data/test/SetUniqueList.emptyCollection.version4.obj | Bin
 .../data/test/SetUniqueList.fullCollection.version4.obj  | Bin
 .../data/test/SingletonMap.emptyCollection.version4.obj  | Bin
 .../data/test/SingletonMap.fullCollection.version4.obj   | Bin
 .../test/SynchronizedBag.emptyCollection.version4.obj    | Bin
 .../test/SynchronizedBag.fullCollection.version4.obj     | Bin
 .../SynchronizedCollection.emptyCollection.version4.obj  | Bin
 .../SynchronizedCollection.fullCollection.version4.obj   | Bin
 .../SynchronizedMultiSet.emptyCollection.version4.1.obj  | Bin
 .../SynchronizedMultiSet.fullCollection.version4.1.obj   | Bin
 .../SynchronizedQueue.emptyCollection.version4.2.obj     | Bin
 .../test/SynchronizedQueue.fullCollection.version4.2.obj | Bin
 .../test/TransformedBag.emptyCollection.version4.obj     | Bin
 .../data/test/TransformedBag.fullCollection.version4.obj | Bin
 .../TransformedCollection.emptyCollection.version4.obj   | Bin
 .../TransformedCollection.fullCollection.version4.obj    | Bin
 .../test/TransformedList.emptyCollection.version4.obj    | Bin
 .../test/TransformedList.fullCollection.version4.obj     | Bin
 .../test/TransformedMap.emptyCollection.version4.obj     | Bin
 .../data/test/TransformedMap.fullCollection.version4.obj | Bin
 ...nsformedMultiValuedMap.emptyCollection.version4.1.obj | Bin
 ...ansformedMultiValuedMap.fullCollection.version4.1.obj | Bin
 ...ransformedNavigableSet.emptyCollection.version4.1.obj | Bin
 ...TransformedNavigableSet.fullCollection.version4.1.obj | Bin
 .../test/TransformedQueue.emptyCollection.version4.obj   | Bin
 .../test/TransformedQueue.fullCollection.version4.obj    | Bin
 .../test/TransformedSet.emptyCollection.version4.obj     | Bin
 .../data/test/TransformedSet.fullCollection.version4.obj | Bin
 .../TransformedSortedBag.emptyCollection.version4.obj    | Bin
 .../TransformedSortedBag.fullCollection.version4.obj     | Bin
 .../TransformedSortedMap.emptyCollection.version4.obj    | Bin
 .../TransformedSortedMap.fullCollection.version4.obj     | Bin
 .../TransformedSortedSet.emptyCollection.version4.obj    | Bin
 .../TransformedSortedSet.fullCollection.version4.obj     | Bin
 .../TransformedSplitMap.emptyCollection.version4.obj     | Bin
 .../test/TransformedSplitMap.fullCollection.version4.obj | Bin
 .../data/test/TransformingComparator.version4.obj        | Bin
 .../data/test/TreeBag.emptyCollection.version4.obj       | Bin
 .../data/test/TreeBag.fullCollection.version4.obj        | Bin
 .../data/test/TreeBidiMap.emptyCollection.version4.obj   | Bin
 .../data/test/TreeBidiMap.fullCollection.version4.obj    | Bin
 .../test/UnmodifiableBag.emptyCollection.version4.obj    | Bin
 .../test/UnmodifiableBag.fullCollection.version4.obj     | Bin
 .../UnmodifiableCollection.emptyCollection.version4.obj  | Bin
 .../UnmodifiableCollection.fullCollection.version4.obj   | Bin
 .../test/UnmodifiableList.emptyCollection.version4.obj   | Bin
 .../test/UnmodifiableList.fullCollection.version4.obj    | Bin
 .../test/UnmodifiableMap.emptyCollection.version4.obj    | Bin
 .../test/UnmodifiableMap.fullCollection.version4.obj     | Bin
 .../UnmodifiableMultiSet.emptyCollection.version4.1.obj  | Bin
 .../UnmodifiableMultiSet.fullCollection.version4.1.obj   | Bin
 ...difiableMultiValuedMap.emptyCollection.version4.1.obj | Bin
 ...odifiableMultiValuedMap.fullCollection.version4.1.obj | Bin
 ...modifiableNavigableSet.emptyCollection.version4.1.obj | Bin
 ...nmodifiableNavigableSet.fullCollection.version4.1.obj | Bin
 .../UnmodifiableOrderedMap.emptyCollection.version4.obj  | Bin
 .../UnmodifiableOrderedMap.fullCollection.version4.obj   | Bin
 .../test/UnmodifiableQueue.emptyCollection.version4.obj  | Bin
 .../test/UnmodifiableQueue.fullCollection.version4.obj   | Bin
 .../test/UnmodifiableSet.emptyCollection.version4.obj    | Bin
 .../test/UnmodifiableSet.fullCollection.version4.obj     | Bin
 .../UnmodifiableSortedBag.emptyCollection.version4.obj   | Bin
 .../UnmodifiableSortedBag.fullCollection.version4.obj    | Bin
 .../UnmodifiableSortedMap.emptyCollection.version4.obj   | Bin
 .../UnmodifiableSortedMap.fullCollection.version4.obj    | Bin
 .../UnmodifiableSortedSet.emptyCollection.version4.obj   | Bin
 .../UnmodifiableSortedSet.fullCollection.version4.obj    | Bin
 .../test/UnmodifiableTrie.emptyCollection.version4.obj   | Bin
 .../test/UnmodifiableTrie.fullCollection.version4.obj    | Bin
 .../commons/collections4}/properties/test.properties     |   0
 .../apache/commons/collections4}/properties/test.xml     |   0
 195 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1bd8549..e423713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -614,7 +614,7 @@
         <configuration>
           <excludes>
             <exclude>site-content/**/*</exclude>
-            <exclude>src/test/resources/data/test/*</exclude>
+            
<exclude>src/test/resources/org/apache/commons/collections4/data/test/*</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git 
a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java 
b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
index ddb9546..9939b1d 100644
--- a/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
+++ b/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
@@ -37,7 +37,6 @@ import java.io.Serializable;
  * If your {@link Object} fails one of these tests by design,
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Object} fails.
- *
  */
 public abstract class AbstractObjectTest extends BulkTest {
 
@@ -173,7 +172,7 @@ public abstract class AbstractObjectTest extends BulkTest {
     }
 
     /**
-     * Tests serialization by comparing against a previously stored version in 
SVN.
+     * Tests serialization by comparing against a previously stored version in 
SCM.
      * If the test object is serializable, confirm that a canonical form 
exists.
      */
     public void testCanonicalEmptyCollectionExists() {
@@ -182,14 +181,14 @@ public abstract class AbstractObjectTest extends BulkTest 
{
             if (object instanceof Serializable) {
                 final String name = getCanonicalEmptyCollectionName(object);
                 assertTrue(
-                    "Canonical empty collection (" + name + ") is not in SVN",
+                    "Canonical empty collection (" + name + ") is not in SCM",
                     new File(name).exists());
             }
         }
     }
 
     /**
-     * Tests serialization by comparing against a previously stored version in 
SVN.
+     * Tests serialization by comparing against a previously stored version in 
SCM.
      * If the test object is serializable, confirm that a canonical form 
exists.
      */
     public void testCanonicalFullCollectionExists() {
@@ -198,7 +197,7 @@ public abstract class AbstractObjectTest extends BulkTest {
             if (object instanceof Serializable) {
                 final String name = getCanonicalFullCollectionName(object);
                 assertTrue(
-                    "Canonical full collection (" + name + ") is not in SVN",
+                    "Canonical full collection (" + name + ") is not in SCM",
                     new File(name).exists());
             }
         }
@@ -212,7 +211,7 @@ public abstract class AbstractObjectTest extends BulkTest {
      * the package change to collections4 introduced in version 4.
      *
      * This constant makes it possible for TestMap (and other subclasses,
-     * if necessary) to automatically check SVN for a versionX copy of a
+     * if necessary) to automatically check SCM for a versionX copy of a
      * Serialized object, so we can make sure that compatibility is maintained.
      * See, for example, TestMap.getCanonicalFullMapName(Map map).
      * Subclasses can override this variable, indicating compatibility
@@ -253,7 +252,7 @@ public abstract class AbstractObjectTest extends BulkTest {
      * Writes a Serializable or Externalizable object as
      * a file at the given path.  NOT USEFUL as part
      * of a unit test; this is just a utility method
-     * for creating disk-based objects in SVN that can become
+     * for creating disk-based objects in SCM that can become
      * the basis for compatibility tests using
      * readExternalFormFromDisk(String path)
      *
@@ -287,7 +286,7 @@ public abstract class AbstractObjectTest extends BulkTest {
     /**
      * Reads a Serialized or Externalized Object from disk.
      * Useful for creating compatibility tests between
-     * different SVN versions of the same class
+     * different SCM versions of the same class
      *
      * @param path path to the serialized Object
      * @return the Object at the given path
diff --git a/src/test/java/org/apache/commons/collections4/BulkTest.java 
b/src/test/java/org/apache/commons/collections4/BulkTest.java
index e13e351..cc97dc4 100644
--- a/src/test/java/org/apache/commons/collections4/BulkTest.java
+++ b/src/test/java/org/apache/commons/collections4/BulkTest.java
@@ -136,7 +136,6 @@ import junit.framework.TestSuite;
  */
 public class BulkTest extends TestCase implements Cloneable {
 
-
     // Note:  BulkTest is Cloneable to make it easier to construct
     // BulkTest instances for simple test methods that are defined in
     // anonymous inner classes.  Basically we don't have to worry about
@@ -145,9 +144,11 @@ public class BulkTest extends TestCase implements 
Cloneable {
     // Given one BulkTest instance, we can just clone it and reset the
     // method name for every simple test it defines.
 
-
     /** Path to test data resources */
-    protected static final String TEST_DATA_PATH = 
"src/test/resources/data/test/";
+    protected static final String TEST_DATA_PATH = 
"src/test/resources/org/apache/commons/collections4/data/test/";
+
+    /** Path to test properties resources */
+    public static final String TEST_PROPERTIES_PATH = 
"src/test/resources/org/apache/commons/collections4/properties/";
 
     /**
      *  The full name of this bulk test instance.  This is the full name
@@ -157,7 +158,6 @@ public class BulkTest extends TestCase implements Cloneable 
{
      */
     String verboseName;
 
-
     /**
      *  Constructs a new {@code BulkTest} instance that will run the
      *  specified simple test.
@@ -169,7 +169,6 @@ public class BulkTest extends TestCase implements Cloneable 
{
         this.verboseName = getClass().getName();
     }
 
-
     /**
      *  Creates a clone of this {@code BulkTest}.<P>
      *
@@ -184,7 +183,6 @@ public class BulkTest extends TestCase implements Cloneable 
{
         }
     }
 
-
     /**
      *  Returns an array of test names to ignore.<P>
      *
@@ -222,7 +220,6 @@ public class BulkTest extends TestCase implements Cloneable 
{
         return null;
     }
 
-
     /**
      *  Returns the display name of this {@code BulkTest}.
      *
@@ -233,7 +230,6 @@ public class BulkTest extends TestCase implements Cloneable 
{
         return getName() + "(" + verboseName + ") ";
     }
 
-
     /**
      *  Returns a {@link TestSuite} for testing all of the simple tests
      *  <I>and</I> all the bulk tests defined by the given class.<P>
@@ -261,7 +257,6 @@ public class BulkTest extends TestCase implements Cloneable 
{
 
 }
 
-
 // It was easier to use a separate class to do all the reflection stuff
 // for making the TestSuite instances.  Having permanent state around makes
 // it easier to handle the recursion.
diff --git 
a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java 
b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
index 969280d..c8e6962 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
@@ -678,7 +678,7 @@ public abstract class AbstractBagTest<T> extends 
AbstractCollectionTest<T> {
 
     /**
      * Compare the current serialized form of the Bag
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testEmptyBagCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
@@ -692,7 +692,7 @@ public abstract class AbstractBagTest<T> extends 
AbstractCollectionTest<T> {
 
     /**
      * Compare the current serialized form of the Bag
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testFullBagCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
diff --git 
a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java 
b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
index 53baa37..385c49c 100644
--- a/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
@@ -88,8 +88,8 @@ public class CollectionBagTest<T> extends 
AbstractCollectionTest<T> {
     //-----------------------------------------------------------------------
 
     /**
-     * Compare the current serialized form of the Bag
-     * against the canonical version in SVN.
+     * Compares the current serialized form of the Bag
+     * against the canonical version in SCM.
      */
     public void testEmptyBagCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
@@ -102,8 +102,8 @@ public class CollectionBagTest<T> extends 
AbstractCollectionTest<T> {
     }
 
     /**
-     * Compare the current serialized form of the Bag
-     * against the canonical version in SVN.
+     * Compares the current serialized form of the Bag
+     * against the canonical version in SCM.
      */
     public void testFullBagCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
diff --git 
a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
 
b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
index 1cb9f6c..dddb17e 100644
--- 
a/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
@@ -129,7 +129,7 @@ public class CollectionSortedBagTest<T> extends 
AbstractCollectionTest<T> {
 
     /**
      * Compare the current serialized form of the Bag
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testEmptyBagCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
@@ -143,7 +143,7 @@ public class CollectionSortedBagTest<T> extends 
AbstractCollectionTest<T> {
 
     /**
      * Compare the current serialized form of the Bag
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testFullBagCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
diff --git 
a/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
 
b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
index c58fc61..38e9f16 100644
--- 
a/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
@@ -177,7 +177,7 @@ public abstract class AbstractComparatorTest<T> extends 
AbstractObjectTest {
 
     /**
      * Compare the current serialized form of the Comparator
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     @SuppressWarnings("unchecked")
     @Test
diff --git 
a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
 
b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
index c6acf13..f8b2e4f 100644
--- 
a/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
@@ -43,7 +43,7 @@ public class ReverseComparatorTest extends 
AbstractComparatorTest<Integer> {
      * Comparator.  The resulting comparator should
      * sort according to natural Order.  (Note: we wrap
      * a Comparator taken from the JDK so that we can
-     * save a "canonical" form in SVN.
+     * save a "canonical" form in SCM.
      *
      * @return Comparator that returns "natural" order
      */
diff --git 
a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java 
b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
index b0b55e7..806bf14 100644
--- a/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
@@ -1068,7 +1068,7 @@ public abstract class AbstractListTest<E> extends 
AbstractCollectionTest<E> {
 
     /**
      * Compare the current serialized form of the List
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     @SuppressWarnings("unchecked")
     public void testEmptyListCompatibility() throws IOException, 
ClassNotFoundException {
@@ -1092,7 +1092,7 @@ public abstract class AbstractListTest<E> extends 
AbstractCollectionTest<E> {
 
     /**
      * Compare the current serialized form of the List
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     @SuppressWarnings("unchecked")
     public void testFullListCompatibility() throws IOException, 
ClassNotFoundException {
diff --git 
a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java 
b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
index a8e5813..7214794 100644
--- a/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
@@ -747,7 +747,7 @@ public abstract class AbstractMapTest<K, V> extends 
AbstractObjectTest {
 
     /**
      * Compare the current serialized form of the Map
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testEmptyMapCompatibility() throws Exception {
         /**
@@ -769,7 +769,7 @@ public abstract class AbstractMapTest<K, V> extends 
AbstractObjectTest {
 
     /**
      * Compare the current serialized form of the Map
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testFullMapCompatibility() throws Exception {
         /**
diff --git 
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
 
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index 161883f..3e4a490 100644
--- 
a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -689,7 +689,7 @@ public abstract class AbstractMultiSetTest<T> extends 
AbstractCollectionTest<T>
 
     /**
      * Compare the current serialized form of the MultiSet
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testEmptyMultiSetCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
@@ -703,7 +703,7 @@ public abstract class AbstractMultiSetTest<T> extends 
AbstractCollectionTest<T>
 
     /**
      * Compare the current serialized form of the MultiSet
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     public void testFullMultiSetCompatibility() throws IOException, 
ClassNotFoundException {
         // test to make sure the canonical form has been preserved
diff --git 
a/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java
 
b/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java
index 43840dc..dcdc9ea 100644
--- 
a/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/properties/AbstractPropertiesFactoryTest.java
@@ -23,6 +23,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Properties;
 
+import org.apache.commons.collections4.BulkTest;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
@@ -47,7 +48,7 @@ public abstract class AbstractPropertiesFactoryTest<T extends 
Properties> {
         super();
         this.factory = factory;
         this.fileExtention = fileExtension;
-        this.pathString = "src/test/resources/properties/test" + fileExtention;
+        this.pathString = BulkTest.TEST_PROPERTIES_PATH + "test" + 
fileExtention;
     }
 
     private void assertContents(final T properties) {
@@ -80,7 +81,7 @@ public abstract class AbstractPropertiesFactoryTest<T extends 
Properties> {
 
     @Test
     public void testLoadClassLoaderResource() throws Exception {
-        assertContents(factory.load(ClassLoader.getSystemClassLoader(), 
"properties/test" + fileExtention));
+        assertContents(factory.load(ClassLoader.getSystemClassLoader(), 
"org/apache/commons/collections4/properties/test" + fileExtention));
     }
 
     @Test
diff --git 
a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java 
b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
index 9fa8063..adf2229 100644
--- a/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
+++ b/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
@@ -337,7 +337,7 @@ public abstract class AbstractQueueTest<E> extends 
AbstractCollectionTest<E> {
 
     /**
      * Compare the current serialized form of the Queue
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     @SuppressWarnings("unchecked")
     public void testEmptyQueueCompatibility() throws IOException, 
ClassNotFoundException {
@@ -360,7 +360,7 @@ public abstract class AbstractQueueTest<E> extends 
AbstractCollectionTest<E> {
 
     /**
      * Compare the current serialized form of the Queue
-     * against the canonical version in SVN.
+     * against the canonical version in SCM.
      */
     @SuppressWarnings("unchecked")
     public void testFullQueueCompatibility() throws IOException, 
ClassNotFoundException {
diff --git 
a/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
 
b/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
index 548be6f..898291e 100644
--- 
a/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
@@ -25,8 +25,7 @@ import org.junit.Ignore;
 import junit.framework.Test;
 
 /**
- * Extension of {@link AbstractQueueTest} for exercising the
- * {@link SynchronizedQueue} implementation.
+ * Extension of {@link AbstractQueueTest} for exercising the {@link 
SynchronizedQueue} implementation.
  *
  * @since 4.2
  */
@@ -40,7 +39,7 @@ public class SynchronizedQueueTest<T> extends 
AbstractQueueTest<T> {
         super(testName);
     }
 
-    //-----------------------------------------------------------------------
+    // -----------------------------------------------------------------------
 
     @Override
     public String getCompatibilityVersion() {
@@ -55,10 +54,11 @@ public class SynchronizedQueueTest<T> extends 
AbstractQueueTest<T> {
     @Ignore("Run once")
     public void testCreate() throws Exception {
         Queue<T> queue = makeObject();
-        writeExternalFormToDisk((java.io.Serializable) queue, 
"src/test/resources/data/test/SynchronizedQueue.emptyCollection.version4.2.obj");
+        writeExternalFormToDisk((java.io.Serializable) queue,
+            BulkTest.TEST_DATA_PATH + 
"SynchronizedQueue.emptyCollection.version4.2.obj");
         queue = makeFullCollection();
-        writeExternalFormToDisk((java.io.Serializable) queue, 
"src/test/resources/data/test/SynchronizedQueue.fullCollection.version4.2.obj");
+        writeExternalFormToDisk((java.io.Serializable) queue,
+            BulkTest.TEST_DATA_PATH + 
"SynchronizedQueue.fullCollection.version4.2.obj");
     }
 
 }
-
diff --git 
a/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
 
b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
index 0976035..adb041f 100644
--- 
a/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
+++ 
b/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
@@ -44,8 +44,6 @@ public class PredicatedSortedSetTest<E> extends 
AbstractSortedSetTest<E> {
         return BulkTest.makeSuite(PredicatedSortedSetTest.class);
     }
 
- //-------------------------------------------------------------------
-
     protected Predicate<E> truePredicate = TruePredicate.<E>truePredicate();
 
     @Override
@@ -60,7 +58,6 @@ public class PredicatedSortedSetTest<E> extends 
AbstractSortedSetTest<E> {
         return PredicatedSortedSet.predicatedSortedSet(set, truePredicate);
     }
 
-//--------------------------------------------------------------------
     protected Predicate<E> testPredicate =
         o -> o instanceof String && ((String) o).startsWith("A");
 
diff --git 
a/src/test/resources/data/test/ArrayListValuedHashMap.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/ArrayListValuedHashMap.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/ArrayListValuedHashMap.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ArrayListValuedHashMap.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/ArrayListValuedHashMap.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/ArrayListValuedHashMap.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/ArrayListValuedHashMap.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ArrayListValuedHashMap.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ArrayStack.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/ArrayStack.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ArrayStack.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ArrayStack.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ArrayStack.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/ArrayStack.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ArrayStack.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/BooleanComparator.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/BooleanComparator.version4.obj
similarity index 100%
rename from src/test/resources/data/test/BooleanComparator.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/BooleanComparator.version4.obj
diff --git 
a/src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CaseInsensitiveMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CaseInsensitiveMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CaseInsensitiveMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CaseInsensitiveMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CaseInsensitiveMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CaseInsensitiveMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CircularFifoQueue.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CircularFifoQueue.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CircularFifoQueue.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CircularFifoQueue.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CircularFifoQueue.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CircularFifoQueue.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CircularFifoQueue.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CollectionBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CollectionBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CollectionBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CollectionBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CollectionBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CollectionBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CollectionBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CollectionSortedBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CollectionSortedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CollectionSortedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CollectionSortedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CollectionSortedBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CollectionSortedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CollectionSortedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CollectionSortedBag.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/ComparableComparator.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ComparableComparator.version4.obj
similarity index 100%
rename from src/test/resources/data/test/ComparableComparator.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ComparableComparator.version4.obj
diff --git a/src/test/resources/data/test/ComparatorChain.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ComparatorChain.version4.obj
similarity index 100%
rename from src/test/resources/data/test/ComparatorChain.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ComparatorChain.version4.obj
diff --git 
a/src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CompositeCollection.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CompositeCollection.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CompositeCollection.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CompositeCollection.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CompositeCollection.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CompositeCollection.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CompositeMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CompositeMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CompositeMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CompositeMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CompositeMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CompositeMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CompositeMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CompositeSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CompositeSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CompositeSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CompositeSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CompositeSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CompositeSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CompositeSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/CursorableLinkedList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CursorableLinkedList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CursorableLinkedList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/CursorableLinkedList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/CursorableLinkedList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/CursorableLinkedList.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/DefaultedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DefaultedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DefaultedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/DefaultedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DefaultedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DefaultedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/DualHashBidiMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualHashBidiMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualHashBidiMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/DualHashBidiMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualHashBidiMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualHashBidiMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualLinkedHashBidiMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualLinkedHashBidiMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.emptyCollection.version4.Test2.obj
diff --git 
a/src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualTreeBidiMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.fullCollection.version4.Test2.obj
diff --git 
a/src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/DualTreeBidiMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/DualTreeBidiMap.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/FixedOrderComparator.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedOrderComparator.version4.obj
similarity index 100%
rename from src/test/resources/data/test/FixedOrderComparator.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedOrderComparator.version4.obj
diff --git 
a/src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedSizeList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/FixedSizeList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedSizeList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedSizeList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/FixedSizeList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedSizeList.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedSizeMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/FixedSizeMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedSizeMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedSizeMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/FixedSizeMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedSizeMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedSizeSortedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/FixedSizeSortedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedSizeSortedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/FixedSizeSortedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/FixedSizeSortedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/FixedSizeSortedMap.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/Flat3Map.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/Flat3Map.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/Flat3Map.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/Flat3Map.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/Flat3Map.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/Flat3Map.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/Flat3Map.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/GrowthList.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/GrowthList.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/GrowthList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/GrowthList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/GrowthList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/GrowthList.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/GrowthList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/GrowthList.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/HashBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/HashBag.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/HashBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashBag.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/HashBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/HashBag.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/HashBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/HashMultiSet.emptyCollection.version4.1.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/HashMultiSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/HashMultiSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashMultiSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/HashMultiSet.fullCollection.version4.1.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/HashMultiSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/HashMultiSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashMultiSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/HashSetValuedHashMap.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/HashSetValuedHashMap.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/HashSetValuedHashMap.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashSetValuedHashMap.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/HashSetValuedHashMap.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/HashSetValuedHashMap.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/HashSetValuedHashMap.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashSetValuedHashMap.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/HashedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/HashedMap.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/HashedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashedMap.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/HashedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/HashedMap.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/HashedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/HashedMap.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/LRUMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LRUMap.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/LRUMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LRUMap.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/LRUMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LRUMap.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/LRUMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LRUMap.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/LazyMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LazyMap.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/LazyMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LazyMap.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/LazyMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LazyMap.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/LazyMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LazyMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LazySortedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/LazySortedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LazySortedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LazySortedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/LazySortedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LazySortedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LinkedMap.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/LinkedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LinkedMap.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/LinkedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/LinkedMap.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/LinkedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/LinkedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ListOrderedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ListOrderedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ListOrderedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ListOrderedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ListOrderedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ListOrderedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ListOrderedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ListOrderedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ListOrderedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ListOrderedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ListOrderedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ListOrderedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MapBackedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/MapBackedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MapBackedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MapBackedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/MapBackedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MapBackedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiKeyMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiKeyMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiKeyMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiKeyMap.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/MultiKeyMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiKeyMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiValueMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiValueMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiValueMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiValueMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiValueMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiValueMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/MultiValuedHashMap.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiValuedHashMap.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiValuedHashMap.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiValuedHashMap.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/MultiValuedHashMap.fullCollection.version4.1.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiValuedHashMap.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiValuedHashMap.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiValuedHashMap.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/MultiValuedLinkedHashMap.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiValuedLinkedHashMap.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiValuedLinkedHashMap.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiValuedLinkedHashMap.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/MultiValuedLinkedHashMap.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/MultiValuedLinkedHashMap.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/MultiValuedLinkedHashMap.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/MultiValuedLinkedHashMap.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/NodeCachingLinkedList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/NodeCachingLinkedList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/NodeCachingLinkedList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/NodeCachingLinkedList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/NodeCachingLinkedList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/NodeCachingLinkedList.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/NullComparator.version4.obj1 
b/src/test/resources/org/apache/commons/collections4/data/test/NullComparator.version4.obj1
similarity index 100%
rename from src/test/resources/data/test/NullComparator.version4.obj1
rename to 
src/test/resources/org/apache/commons/collections4/data/test/NullComparator.version4.obj1
diff --git a/src/test/resources/data/test/NullComparator.version4.obj2 
b/src/test/resources/org/apache/commons/collections4/data/test/NullComparator.version4.obj2
similarity index 100%
rename from src/test/resources/data/test/NullComparator.version4.obj2
rename to 
src/test/resources/org/apache/commons/collections4/data/test/NullComparator.version4.obj2
diff --git 
a/src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PassiveExpiringMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PassiveExpiringMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PassiveExpiringMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PassiveExpiringMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PassiveExpiringMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PassiveExpiringMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PatriciaTrie.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PatriciaTrie.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PatriciaTrie.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PatriciaTrie.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PatriciaTrie.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PatriciaTrie.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PatriciaTrie.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PatriciaTrie.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedCollection.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedCollection.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedCollection.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedCollection.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedCollection.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedCollection.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedList.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedMultiSet.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedMultiSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedMultiSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedMultiSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/PredicatedMultiSet.fullCollection.version4.1.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedMultiSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedMultiSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedMultiSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/PredicatedNavigableSet.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedNavigableSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedNavigableSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedNavigableSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/PredicatedNavigableSet.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedNavigableSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedNavigableSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedNavigableSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/PredicatedQueue.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedQueue.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedQueue.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedQueue.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedQueue.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedQueue.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedQueue.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedQueue.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSortedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSortedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSortedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSortedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSortedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/PredicatedSortedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/PredicatedSortedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/ReferenceIdentityMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ReferenceIdentityMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ReferenceIdentityMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ReferenceIdentityMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ReferenceIdentityMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ReferenceIdentityMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ReferenceMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ReferenceMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ReferenceMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ReferenceMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/ReferenceMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ReferenceMap.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/ReverseComparator.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/ReverseComparator.version4.obj
similarity index 100%
rename from src/test/resources/data/test/ReverseComparator.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/ReverseComparator.version4.obj
diff --git 
a/src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SetUniqueList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SetUniqueList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SetUniqueList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SetUniqueList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SetUniqueList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SetUniqueList.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SingletonMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SingletonMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SingletonMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SingletonMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SingletonMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SingletonMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SingletonMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SynchronizedBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SynchronizedBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedCollection.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedCollection.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedCollection.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedCollection.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedCollection.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedCollection.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/SynchronizedMultiSet.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedMultiSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedMultiSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedMultiSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/SynchronizedMultiSet.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedMultiSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedMultiSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedMultiSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/SynchronizedQueue.emptyCollection.version4.2.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedQueue.emptyCollection.version4.2.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedQueue.emptyCollection.version4.2.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedQueue.emptyCollection.version4.2.obj
diff --git 
a/src/test/resources/data/test/SynchronizedQueue.fullCollection.version4.2.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/SynchronizedQueue.fullCollection.version4.2.obj
similarity index 100%
rename from 
src/test/resources/data/test/SynchronizedQueue.fullCollection.version4.2.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/SynchronizedQueue.fullCollection.version4.2.obj
diff --git 
a/src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedCollection.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedCollection.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedCollection.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedCollection.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedCollection.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedCollection.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedList.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedList.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedMultiValuedMap.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedMultiValuedMap.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedMultiValuedMap.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedMultiValuedMap.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/TransformedMultiValuedMap.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedMultiValuedMap.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedMultiValuedMap.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedMultiValuedMap.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/TransformedNavigableSet.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedNavigableSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedNavigableSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedNavigableSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/TransformedNavigableSet.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedNavigableSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedNavigableSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedNavigableSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedQueue.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedQueue.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedQueue.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedQueue.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedQueue.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedQueue.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedQueue.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSortedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSortedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSortedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSortedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSortedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSortedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSortedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSplitMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSplitMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSplitMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformedSplitMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TransformedSplitMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformedSplitMap.fullCollection.version4.obj
diff --git a/src/test/resources/data/test/TransformingComparator.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TransformingComparator.version4.obj
similarity index 100%
rename from src/test/resources/data/test/TransformingComparator.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TransformingComparator.version4.obj
diff --git a/src/test/resources/data/test/TreeBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TreeBag.emptyCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/TreeBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TreeBag.emptyCollection.version4.obj
diff --git a/src/test/resources/data/test/TreeBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TreeBag.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/TreeBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TreeBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TreeBidiMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TreeBidiMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/TreeBidiMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TreeBidiMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/TreeBidiMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/TreeBidiMap.fullCollection.version4.obj
similarity index 100%
rename from src/test/resources/data/test/TreeBidiMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/TreeBidiMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableBag.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableBag.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableCollection.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableCollection.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableCollection.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableCollection.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableCollection.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableCollection.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableList.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableList.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableList.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableList.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableList.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableList.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableMultiSet.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableMultiSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableMultiSet.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableMultiSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableMultiValuedMap.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiValuedMap.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableMultiValuedMap.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiValuedMap.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableMultiValuedMap.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiValuedMap.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableMultiValuedMap.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableMultiValuedMap.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableNavigableSet.emptyCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableNavigableSet.emptyCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableNavigableSet.emptyCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableNavigableSet.emptyCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableNavigableSet.fullCollection.version4.1.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableNavigableSet.fullCollection.version4.1.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableNavigableSet.fullCollection.version4.1.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableNavigableSet.fullCollection.version4.1.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableOrderedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableOrderedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableQueue.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableQueue.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableQueue.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableQueue.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableQueue.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableQueue.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableQueue.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSortedBag.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedBag.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSortedBag.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedBag.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSortedBag.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedBag.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSortedBag.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedBag.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedMap.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedMap.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSortedMap.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedMap.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedSet.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj
 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedSet.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableSortedSet.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableSortedSet.fullCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableTrie.emptyCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableTrie.emptyCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableTrie.emptyCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableTrie.emptyCollection.version4.obj
diff --git 
a/src/test/resources/data/test/UnmodifiableTrie.fullCollection.version4.obj 
b/src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableTrie.fullCollection.version4.obj
similarity index 100%
rename from 
src/test/resources/data/test/UnmodifiableTrie.fullCollection.version4.obj
rename to 
src/test/resources/org/apache/commons/collections4/data/test/UnmodifiableTrie.fullCollection.version4.obj
diff --git a/src/test/resources/properties/test.properties 
b/src/test/resources/org/apache/commons/collections4/properties/test.properties
similarity index 100%
rename from src/test/resources/properties/test.properties
rename to 
src/test/resources/org/apache/commons/collections4/properties/test.properties
diff --git a/src/test/resources/properties/test.xml 
b/src/test/resources/org/apache/commons/collections4/properties/test.xml
similarity index 100%
rename from src/test/resources/properties/test.xml
rename to src/test/resources/org/apache/commons/collections4/properties/test.xml

[commons-collections] branch master updated: Move test fixtures to component specific folder.

Reply via email to