You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/21 17:49:38 UTC
[commons-collections] branch master updated: Use for-each.
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 7772907 Use for-each.
7772907 is described below
commit 7772907e3a1c379261d7614fc53d3a6d24343bcd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 12:49:34 2020 -0500
Use for-each.
---
.../apache/commons/collections4/MapUtilsTest.java | 26 +++++++++++-----------
.../collection/AbstractCollectionTest.java | 2 +-
.../iterators/CollatingIteratorTest.java | 10 ++++-----
.../iterators/ZippingIteratorTest.java | 10 ++++-----
.../sequence/SequencesComparatorTest.java | 6 ++---
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
index c002052..396af2c 100644
--- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
@@ -813,11 +813,11 @@ public class MapUtilsTest {
MapUtils.populateMap(map, list, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
assertEquals(list.size(), map.size());
- for (int i = 0; i < list.size(); i++) {
- assertTrue(map.containsKey(Integer.valueOf(list.get(i))));
- assertFalse(map.containsKey(list.get(i)));
- assertTrue(map.containsValue(list.get(i)));
- assertEquals(list.get(i), map.get(Integer.valueOf(list.get(i))));
+ for (String element : list) {
+ assertTrue(map.containsKey(Integer.valueOf(element)));
+ assertFalse(map.containsKey(element));
+ assertTrue(map.containsValue(element));
+ assertEquals(element, map.get(Integer.valueOf(element)));
}
// Now test both Key-Value transform population
@@ -825,11 +825,11 @@ public class MapUtilsTest {
MapUtils.populateMap(map, list, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
assertEquals(list.size(), map.size());
- for (int i = 0; i < list.size(); i++) {
- assertTrue(map.containsKey(Integer.valueOf(list.get(i))));
- assertFalse(map.containsKey(list.get(i)));
- assertTrue(map.containsValue(Integer.valueOf(list.get(i))));
- assertEquals(Integer.valueOf(list.get(i)), map.get(Integer.valueOf(list.get(i))));
+ for (String element : list) {
+ assertTrue(map.containsKey(Integer.valueOf(element)));
+ assertFalse(map.containsKey(element));
+ assertTrue(map.containsValue(Integer.valueOf(element)));
+ assertEquals(Integer.valueOf(element), map.get(Integer.valueOf(element)));
}
}
@@ -866,9 +866,9 @@ public class MapUtilsTest {
MapUtils.populateMap(map, list, (Transformer<X, Integer>) input -> input.key, TransformerUtils.<X>nopTransformer());
assertEquals(list.size(), map.totalSize());
- for (int i = 0; i < list.size(); i++) {
- assertTrue(map.containsKey(list.get(i).key));
- assertTrue(map.containsValue(list.get(i)));
+ for (X element : list) {
+ assertTrue(map.containsKey(element.key));
+ assertTrue(map.containsValue(element));
}
}
diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index 1b5a0d2..8958600 100644
--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -752,7 +752,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
resetFull();
it1 = getCollection().iterator();
- for (int i = 0; i < getCollection().size(); i++) {
+ for (E element : getCollection()) {
assertTrue("Iterator for full collection should haveNext", it1.hasNext());
it1.next();
}
diff --git a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
index 1f5106a..aa9b167 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
@@ -97,9 +97,9 @@ public class CollatingIteratorTest extends AbstractIteratorTest<Integer> {
public void testIterateEven() {
final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
iter.addIterator(evens.iterator());
- for (int i = 0; i < evens.size(); i++) {
+ for (Integer even : evens) {
assertTrue(iter.hasNext());
- assertEquals(evens.get(i), iter.next());
+ assertEquals(even, iter.next());
assertEquals(0, iter.getIteratorIndex());
}
assertTrue(!iter.hasNext());
@@ -129,12 +129,12 @@ public class CollatingIteratorTest extends AbstractIteratorTest<Integer> {
final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
iter.addIterator(evens.iterator());
iter.addIterator(evens.iterator());
- for (int i = 0; i < evens.size(); i++) {
+ for (Integer even : evens) {
assertTrue(iter.hasNext());
- assertEquals(evens.get(i), iter.next());
+ assertEquals(even, iter.next());
assertEquals(0, iter.getIteratorIndex());
assertTrue(iter.hasNext());
- assertEquals(evens.get(i), iter.next());
+ assertEquals(even, iter.next());
assertEquals(1, iter.getIteratorIndex());
}
assertTrue(!iter.hasNext());
diff --git a/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
index cbb7e05..a817d73 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
@@ -80,9 +80,9 @@ public class ZippingIteratorTest extends AbstractIteratorTest<Integer> {
public void testIterateEven() {
@SuppressWarnings("unchecked")
final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator());
- for (int i = 0; i < evens.size(); i++) {
+ for (Integer even : evens) {
assertTrue(iter.hasNext());
- assertEquals(evens.get(i), iter.next());
+ assertEquals(even, iter.next());
}
assertTrue(!iter.hasNext());
}
@@ -113,11 +113,11 @@ public class ZippingIteratorTest extends AbstractIteratorTest<Integer> {
public void testIterateEvenEven() {
final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator(), evens.iterator());
- for (int i = 0; i < evens.size(); i++) {
+ for (Integer even : evens) {
assertTrue(iter.hasNext());
- assertEquals(evens.get(i), iter.next());
+ assertEquals(even, iter.next());
assertTrue(iter.hasNext());
- assertEquals(evens.get(i), iter.next());
+ assertEquals(even, iter.next());
}
assertTrue(!iter.hasNext());
}
diff --git a/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java b/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
index 88bb25a..3164559 100644
--- a/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
@@ -129,10 +129,10 @@ public class SequencesComparatorTest {
final ExecutionVisitor<String> ev = new ExecutionVisitor<>();
- for (int i = 0; i < shadokSentences.size(); ++i) {
+ for (List<String> element : shadokSentences) {
for (final List<String> shadokSentence : shadokSentences) {
- ev.setList(shadokSentences.get(i));
- new SequencesComparator<>(shadokSentences.get(i),
+ ev.setList(element);
+ new SequencesComparator<>(element,
shadokSentence).getScript().visit(ev);
final StringBuilder concat = new StringBuilder();