diff --git a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java index 01587f9f55..fca963a1d0 100644 --- a/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java +++ b/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java @@ -437,8 +437,8 @@ public void testAsMultipleIterableNull() { @Test public void testChainedIterator() { final ArrayList arrayList = new ArrayList(); - final Iterator ie = arrayList.iterator(); - assertTrue(IteratorUtils.chainedIterator(ie) instanceof Iterator, "create instance fail"); + final Iterator iterator = arrayList.iterator(); + assertTrue(IteratorUtils.chainedIterator(iterator) instanceof Iterator, "create instance fail"); final Collection> coll = new ArrayList(); assertTrue(IteratorUtils.chainedIterator(coll) instanceof Iterator, "create instance fail"); } @@ -649,9 +649,9 @@ public void testEmptyOrderedMapIterator() { @Test public void testFilteredIterator() { final ArrayList arrayList = new ArrayList(); - final Iterator ie = arrayList.iterator(); + final Iterator iterator = arrayList.iterator(); assertAll( - () -> assertThrows(NullPointerException.class, () -> IteratorUtils.filteredIterator(ie, null)), + () -> assertThrows(NullPointerException.class, () -> IteratorUtils.filteredIterator(iterator, null)), () -> assertThrows(NullPointerException.class, () -> IteratorUtils.filteredIterator(null, null)) ); } @@ -805,7 +805,7 @@ public void testLoopingIterator() { arrayList.add("test"); final Collection coll = new ArrayList(); coll.add("test"); - final Iterator ie = arrayList.iterator(); + final Iterator iterator = arrayList.iterator(); assertTrue(IteratorUtils.loopingIterator(coll) instanceof ResettableIterator, "create instance fail"); assertThrows(NullPointerException.class, () -> IteratorUtils.loopingIterator(null)); } @@ -814,7 +814,7 @@ public void testLoopingIterator() { public void testLoopingListIterator() { final ArrayList arrayList = new ArrayList(); arrayList.add("test"); - final Iterator ie = arrayList.iterator(); + final Iterator iterator = arrayList.iterator(); assertTrue(IteratorUtils.loopingListIterator(arrayList) instanceof ResettableIterator, "create instance fail"); assertThrows(NullPointerException.class, () -> IteratorUtils.loopingListIterator(null)); } @@ -880,16 +880,16 @@ public void testObjectGraphIterator() { @Test public void testPeekingIterator() { final ArrayList arrayList = new ArrayList(); - final Iterator ie = arrayList.iterator(); - assertTrue(IteratorUtils.peekingIterator(ie) instanceof Iterator, "create instance fail"); + final Iterator iterator = arrayList.iterator(); + assertTrue(IteratorUtils.peekingIterator(iterator) instanceof Iterator, "create instance fail"); assertThrows(NullPointerException.class, () -> IteratorUtils.peekingIterator(null)); } @Test public void testPushBackIterator() { final ArrayList arrayList = new ArrayList(); - final Iterator ie = arrayList.iterator(); - assertTrue(IteratorUtils.pushbackIterator(ie) instanceof Iterator, "create instance fail"); + final Iterator iterator = arrayList.iterator(); + assertTrue(IteratorUtils.pushbackIterator(iterator) instanceof Iterator, "create instance fail"); assertThrows(NullPointerException.class, () -> IteratorUtils.pushbackIterator(null)); } @@ -974,9 +974,9 @@ public void testToListIteratorNull() { @Test public void testTransformedIterator() { final ArrayList arrayList = new ArrayList(); - final Iterator ie = arrayList.iterator(); + final Iterator iterator = arrayList.iterator(); assertAll( - () -> assertThrows(NullPointerException.class, () -> IteratorUtils.transformedIterator(ie, null)), + () -> assertThrows(NullPointerException.class, () -> IteratorUtils.transformedIterator(iterator, null)), () -> assertThrows(NullPointerException.class, () -> IteratorUtils.transformedIterator(null, null)) ); } @@ -1103,17 +1103,17 @@ public void testUnmodifiableListIteratorIteration() { @Test public void testUnmodifiableMapIterator() { final Set set = new LinkedHashSet<>(); - final MapIterator ie = new EntrySetToMapIteratorAdapter(set); - assertTrue(IteratorUtils.unmodifiableMapIterator(ie) instanceof MapIterator, "create instance fail"); + final MapIterator iterator = new EntrySetToMapIteratorAdapter(set); + assertTrue(IteratorUtils.unmodifiableMapIterator(iterator) instanceof MapIterator, "create instance fail"); assertThrows(NullPointerException.class, () -> IteratorUtils.unmodifiableMapIterator(null)); } @Test public void testZippingIterator() { final ArrayList arrayList = new ArrayList(); - final Iterator ie = arrayList.iterator(); - assertTrue(IteratorUtils.zippingIterator(ie, ie, ie) instanceof ZippingIterator, "create instance fail"); - assertTrue(IteratorUtils.zippingIterator(ie, ie) instanceof ZippingIterator, "create instance fail"); + final Iterator iterator = arrayList.iterator(); + assertTrue(IteratorUtils.zippingIterator(iterator, iterator, iterator) instanceof ZippingIterator, "create instance fail"); + assertTrue(IteratorUtils.zippingIterator(iterator, iterator) instanceof ZippingIterator, "create instance fail"); } }