Skip to content

Commit 21a350f

Browse files
committed
fiddling
1 parent f956559 commit 21a350f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ public IsIterableContainingInOrder(List<Matcher<? super E>> matchers) {
2020

2121
@Override
2222
protected boolean matchesSafely(Iterable<? extends E> iterable, Description mismatchDescription) {
23-
final MatchSeries<E> matchSeries = new MatchSeries<>(matchers, mismatchDescription);
23+
final MatchInOrder<E> inOrder = new MatchInOrder<>(matchers, mismatchDescription);
2424
for (E item : iterable) {
25-
if (!matchSeries.matches(item)) {
25+
if (!inOrder.matches(item)) {
2626
return false;
2727
}
2828
}
2929

30-
return matchSeries.isFinished();
30+
return inOrder.isFinished();
3131
}
3232

3333
@Override
3434
public void describeTo(Description description) {
3535
description.appendText("iterable containing ").appendList("[", ", ", "]", matchers);
3636
}
3737

38-
private static class MatchSeries<F> {
38+
private static class MatchInOrder<F> {
3939
private final List<Matcher<? super F>> matchers;
4040
private final Description mismatchDescription;
4141
private int nextMatchIx = 0;
4242

43-
public MatchSeries(List<Matcher<? super F>> matchers, Description mismatchDescription) {
43+
public MatchInOrder(List<Matcher<? super F>> matchers, Description mismatchDescription) {
4444
this.mismatchDescription = mismatchDescription;
4545
if (matchers.isEmpty()) {
4646
throw new IllegalArgumentException("Should specify at least one expected element");

hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ public MatchSeriesInRelativeOrder(List<Matcher<? super F>> matchers, Description
4545
public void processItems(Iterable<? extends F> iterable) {
4646
for (F item : iterable) {
4747
if (nextMatchIx < matchers.size()) {
48-
Matcher<? super F> matcher = matchers.get(nextMatchIx);
49-
if (matcher.matches(item)) {
48+
if (matchers.get(nextMatchIx).matches(item)) {
5049
lastMatchedItem = item;
5150
nextMatchIx++;
5251
}

0 commit comments

Comments
 (0)