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
commit 2d8ad42bdecd27a2248876876f489725fa0fc5b1 Author: Gary Gregory <[email protected]> AuthorDate: Sat Oct 19 09:45:36 2024 -0400 Add missing test Rename existing test --- .../commons/collections4/IteratorUtilsTest.java | 23 +++++++++++++++++++++- .../collections4/iterators/IteratorChainTest.java | 16 +++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java index 931234392..519a73540 100644 --- a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java @@ -53,6 +53,7 @@ import org.apache.commons.collections4.iterators.EmptyMapIterator; import org.apache.commons.collections4.iterators.EmptyOrderedIterator; import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator; import org.apache.commons.collections4.iterators.EnumerationIterator; +import org.apache.commons.collections4.iterators.IteratorChainTest; import org.apache.commons.collections4.iterators.NodeListIterator; import org.apache.commons.collections4.iterators.ObjectArrayIterator; import org.apache.commons.collections4.iterators.ZippingIterator; @@ -435,7 +436,7 @@ public class IteratorUtilsTest { } @Test - public void testChainedIterator() { + public void testChainedIteratorRawGenerics() { final ArrayList arrayList = new ArrayList(); final Iterator iterator = arrayList.iterator(); assertTrue(IteratorUtils.chainedIterator(iterator) instanceof Iterator, "create instance fail"); @@ -443,6 +444,26 @@ public class IteratorUtilsTest { assertTrue(IteratorUtils.chainedIterator(coll) instanceof Iterator, "create instance fail"); } + @Test + public void testChainedIteratorString() { + // String + final IteratorChainTest iteratorChainTest = new IteratorChainTest(); + iteratorChainTest.setUp(); + // @formateter:off + final Iterator<String> iterator = IteratorUtils.chainedIterator( + iteratorChainTest.getList1().iterator(), + iteratorChainTest.getList2().iterator(), + iteratorChainTest.getList3().iterator()); + // @formateter:on + assertEquals("One", iterator.next()); + assertEquals("Two", iterator.next()); + assertEquals("Three", iterator.next()); + assertEquals("Four", iterator.next()); + assertEquals("Five", iterator.next()); + assertEquals("Six", iterator.next()); + assertFalse(iterator.hasNext()); + } + /** * Tests methods collatedIterator(...) */ diff --git a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java index 73fa7b20f..0654fec36 100644 --- a/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java +++ b/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java @@ -49,6 +49,22 @@ public class IteratorChainTest extends AbstractIteratorTest<String> { super(IteratorChainTest.class.getSimpleName()); } + public List<String> getList1() { + return list1; + } + + public List<String> getList2() { + return list2; + } + + public List<String> getList3() { + return list3; + } + + public String[] getTestArray() { + return testArray; + } + @Override public IteratorChain<String> makeEmptyIterator() { final ArrayList<String> list = new ArrayList<>();
