From 1f969bbc340bf4ceabce28ee4464d340338f2d3c Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Sun, 26 Aug 2012 19:52:58 +0000 Subject: [PATCH] Changes due to renaming of iterators test classes. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1377503 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/collections/bidimap/AbstractBidiMapTest.java | 4 ++-- .../collections/bidimap/AbstractOrderedBidiMapTest.java | 4 ++-- .../org/apache/commons/collections/list/AbstractListTest.java | 4 ++-- .../commons/collections/map/AbstractTestIterableMap.java | 4 ++-- .../commons/collections/map/AbstractTestOrderedMap.java | 4 ++-- .../java/org/apache/commons/collections/map/TestFlat3Map.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java b/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java index b01168f63..caff28110 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections/bidimap/AbstractBidiMapTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.AbstractTestMapIterator; +import org.apache.commons.collections.iterators.AbstractMapIteratorTest; import org.apache.commons.collections.map.AbstractTestIterableMap; /** @@ -475,7 +475,7 @@ public abstract class AbstractBidiMapTest extends AbstractTestIterableMap< return new TestBidiMapIterator(); } - public class TestBidiMapIterator extends AbstractTestMapIterator { + public class TestBidiMapIterator extends AbstractMapIteratorTest { public TestBidiMapIterator() { super("TestBidiMapIterator"); } diff --git a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java b/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java index a9206ef74..4de1b0721 100644 --- a/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java +++ b/src/test/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapTest.java @@ -26,7 +26,7 @@ import java.util.NoSuchElementException; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.OrderedBidiMap; -import org.apache.commons.collections.iterators.AbstractTestMapIterator; +import org.apache.commons.collections.iterators.AbstractMapIteratorTest; /** * Abstract test class for {@link OrderedBidiMap} methods and contracts. @@ -157,7 +157,7 @@ public abstract class AbstractOrderedBidiMapTest extends AbstractBidiMapTe return (OrderedBidiMap) super.getMap(); } - public class TestBidiOrderedMapIterator extends AbstractTestMapIterator { + public class TestBidiOrderedMapIterator extends AbstractMapIteratorTest { public TestBidiOrderedMapIterator() { super("TestBidiOrderedMapIterator"); } diff --git a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java b/src/test/java/org/apache/commons/collections/list/AbstractListTest.java index 21cd884ae..bc96f473e 100644 --- a/src/test/java/org/apache/commons/collections/list/AbstractListTest.java +++ b/src/test/java/org/apache/commons/collections/list/AbstractListTest.java @@ -33,7 +33,7 @@ import java.util.NoSuchElementException; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.collection.AbstractCollectionTest; -import org.apache.commons.collections.iterators.AbstractTestListIterator; +import org.apache.commons.collections.iterators.AbstractListIteratorTest; /** * Abstract test class for {@link java.util.List} methods and contracts. @@ -1315,7 +1315,7 @@ public abstract class AbstractListTest extends AbstractCollectionTest { return new TestListIterator(); } - public class TestListIterator extends AbstractTestListIterator { + public class TestListIterator extends AbstractListIteratorTest { public TestListIterator() { super("TestListIterator"); } diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java b/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java index e3446d71b..a88afbadb 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractTestIterableMap.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.AbstractTestMapIterator; +import org.apache.commons.collections.iterators.AbstractMapIteratorTest; /** * Abstract test class for {@link IterableMap} methods and contracts. @@ -129,7 +129,7 @@ public abstract class AbstractTestIterableMap extends AbstractTestMap { + public class InnerTestMapIterator extends AbstractMapIteratorTest { public InnerTestMapIterator() { super("InnerTestMapIterator"); } diff --git a/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java b/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java index 3772ca6be..b29262a6f 100644 --- a/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java +++ b/src/test/java/org/apache/commons/collections/map/AbstractTestOrderedMap.java @@ -29,7 +29,7 @@ import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.OrderedMapIterator; import org.apache.commons.collections.comparators.NullComparator; -import org.apache.commons.collections.iterators.AbstractTestOrderedMapIterator; +import org.apache.commons.collections.iterators.AbstractOrderedMapIteratorTest; /** * Abstract test class for {@link OrderedMap} methods and contracts. @@ -194,7 +194,7 @@ public abstract class AbstractTestOrderedMap extends AbstractTestIterableM return new InnerTestOrderedMapIterator(); } - public class InnerTestOrderedMapIterator extends AbstractTestOrderedMapIterator { + public class InnerTestOrderedMapIterator extends AbstractOrderedMapIteratorTest { public InnerTestOrderedMapIterator() { super("InnerTestOrderedMapIterator"); } diff --git a/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java b/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java index 608a245e2..1a9dbc03e 100644 --- a/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java +++ b/src/test/java/org/apache/commons/collections/map/TestFlat3Map.java @@ -27,7 +27,7 @@ import junit.framework.Test; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.IterableMap; import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.iterators.AbstractTestMapIterator; +import org.apache.commons.collections.iterators.AbstractMapIteratorTest; /** * JUnit tests. @@ -343,7 +343,7 @@ public class TestFlat3Map extends AbstractTestIterableMap { return new TestFlatMapIterator(); } - public class TestFlatMapIterator extends AbstractTestMapIterator { + public class TestFlatMapIterator extends AbstractMapIteratorTest { public TestFlatMapIterator() { super("TestFlatMapIterator"); }