Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify MatcherApplicationStrategy #2803

Merged
merged 1 commit into from Nov 28, 2022
Merged

Simplify MatcherApplicationStrategy #2803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 29 additions & 51 deletions src/main/java/org/mockito/internal/invocation/MatcherApplicationStrategy.java
View file
Open in desktop
Expand Up @@ -4,10 +4,6 @@
*/
package org.mockito.internal.invocation;

import static org.mockito.internal.invocation.MatcherApplicationStrategy.MatcherApplicationType.ERROR_UNSUPPORTED_NUMBER_OF_MATCHERS;
import static org.mockito.internal.invocation.MatcherApplicationStrategy.MatcherApplicationType.MATCH_EACH_VARARGS_WITH_LAST_MATCHER;
import static org.mockito.internal.invocation.MatcherApplicationStrategy.MatcherApplicationType.ONE_MATCHER_PER_ARGUMENT;

import java.util.ArrayList;
import java.util.List;

Expand All @@ -20,22 +16,12 @@
public class MatcherApplicationStrategy {

private final Invocation invocation;
private final List<ArgumentMatcher<?>> matchers;
private final MatcherApplicationType matchingType;
private final List<? extends ArgumentMatcher<?>> matchers;

private MatcherApplicationStrategy(
Invocation invocation,
List<ArgumentMatcher<?>> matchers,
MatcherApplicationType matchingType) {
Invocation invocation, List<? extends ArgumentMatcher<?>> matchers) {
this.invocation = invocation;
if (matchingType == MATCH_EACH_VARARGS_WITH_LAST_MATCHER) {
int times = varargLength(invocation);
this.matchers = appendLastMatcherNTimes(matchers, times);
} else {
this.matchers = matchers;
}

this.matchingType = matchingType;
this.matchers = matchers;
}

/**
Expand All @@ -51,10 +37,8 @@ private MatcherApplicationStrategy(
* @return never <code>null</code>
*/
public static MatcherApplicationStrategy getMatcherApplicationStrategyFor(
Invocation invocation, List<ArgumentMatcher<?>> matchers) {

MatcherApplicationType type = getMatcherApplicationType(invocation, matchers);
return new MatcherApplicationStrategy(invocation, matchers, type);
Invocation invocation, List<? extends ArgumentMatcher<?>> matchers) {
return new MatcherApplicationStrategy(invocation, matchers);
}

/**
Expand All @@ -74,11 +58,28 @@ public static MatcherApplicationStrategy getMatcherApplicationStrategyFor(
* </ul>
*/
public boolean forEachMatcherAndArgument(ArgumentMatcherAction action) {
if (matchingType == ERROR_UNSUPPORTED_NUMBER_OF_MATCHERS) {
return false;
if (invocation.getArguments().length == matchers.size()) {
return argsMatch(invocation.getArguments(), matchers, action);
}

Object[] arguments = invocation.getArguments();
final boolean isVararg =
invocation.getMethod().isVarArgs()
&& invocation.getRawArguments().length == matchers.size()
&& isLastMatcherVarargMatcher(matchers);

if (isVararg) {
int times = varargLength(invocation);
final List<? extends ArgumentMatcher<?>> matchers = appendLastMatcherNTimes(times);
return argsMatch(invocation.getArguments(), matchers, action);
}

return false;
}

private boolean argsMatch(
Object[] arguments,
List<? extends ArgumentMatcher<?>> matchers,
ArgumentMatcherAction action) {
for (int i = 0; i < arguments.length; i++) {
ArgumentMatcher<?> matcher = matchers.get(i);
Object argument = arguments[i];
Expand All @@ -90,33 +91,16 @@ public boolean forEachMatcherAndArgument(ArgumentMatcherAction action) {
return true;
}

private static MatcherApplicationType getMatcherApplicationType(
Invocation invocation, List<ArgumentMatcher<?>> matchers) {
final int rawArguments = invocation.getRawArguments().length;
final int expandedArguments = invocation.getArguments().length;
final int matcherCount = matchers.size();

if (expandedArguments == matcherCount) {
return ONE_MATCHER_PER_ARGUMENT;
}

if (rawArguments == matcherCount && isLastMatcherVarargMatcher(matchers)) {
return MATCH_EACH_VARARGS_WITH_LAST_MATCHER;
}

return ERROR_UNSUPPORTED_NUMBER_OF_MATCHERS;
}

private static boolean isLastMatcherVarargMatcher(final List<ArgumentMatcher<?>> matchers) {
private static boolean isLastMatcherVarargMatcher(List<? extends ArgumentMatcher<?>> matchers) {
ArgumentMatcher<?> argumentMatcher = lastMatcher(matchers);
if (argumentMatcher instanceof HamcrestArgumentMatcher<?>) {
return ((HamcrestArgumentMatcher<?>) argumentMatcher).isVarargMatcher();
}
return argumentMatcher instanceof VarargMatcher;
}

private static List<ArgumentMatcher<?>> appendLastMatcherNTimes(
List<ArgumentMatcher<?>> matchers, int timesToAppendLastMatcher) {
private List<? extends ArgumentMatcher<?>> appendLastMatcherNTimes(
int timesToAppendLastMatcher) {
ArgumentMatcher<?> lastMatcher = lastMatcher(matchers);

List<ArgumentMatcher<?>> expandedMatchers = new ArrayList<ArgumentMatcher<?>>(matchers);
Expand All @@ -132,13 +116,7 @@ private static int varargLength(Invocation invocation) {
return expandedArgumentCount - rawArgumentCount;
}

private static ArgumentMatcher<?> lastMatcher(List<ArgumentMatcher<?>> matchers) {
private static ArgumentMatcher<?> lastMatcher(List<? extends ArgumentMatcher<?>> matchers) {
return matchers.get(matchers.size() - 1);
}

enum MatcherApplicationType {
ONE_MATCHER_PER_ARGUMENT,
MATCH_EACH_VARARGS_WITH_LAST_MATCHER,
ERROR_UNSUPPORTED_NUMBER_OF_MATCHERS;
}
}
11 changes: 6 additions & 5 deletions src/test/java/org/mockito/internal/invocation/MatcherApplicationStrategyTest.java
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ public class MatcherApplicationStrategyTest extends TestBase {

@Mock IMethods mock;
private Invocation invocation;
private List matchers;
private List<? extends ArgumentMatcher<?>> matchers;

private RecordingAction recordAction;

Expand Down Expand Up @@ -213,7 +213,8 @@ public void shouldMatchAnyEvenIfMatcherIsDecorated() {
public void shouldMatchAnyEvenIfMatcherIsWrappedInHamcrestMatcher() {
// given
invocation = varargs("1", "2");
HamcrestArgumentMatcher argumentMatcher = new HamcrestArgumentMatcher(new IntMatcher());
HamcrestArgumentMatcher<Integer> argumentMatcher =
new HamcrestArgumentMatcher<>(new IntMatcher());
matchers = asList(argumentMatcher);

// when
Expand All @@ -224,7 +225,7 @@ public void shouldMatchAnyEvenIfMatcherIsWrappedInHamcrestMatcher() {
recordAction.assertContainsExactly(argumentMatcher, argumentMatcher);
}

class IntMatcher extends BaseMatcher<Integer> implements VarargMatcher {
private static class IntMatcher extends BaseMatcher<Integer> implements VarargMatcher {
public boolean matches(Object o) {
return true;
}
Expand All @@ -242,8 +243,8 @@ private Invocation varargs(String... s) {
return getLastInvocation();
}

private class RecordingAction implements ArgumentMatcherAction {
private List<ArgumentMatcher<?>> matchers = new ArrayList<ArgumentMatcher<?>>();
private static class RecordingAction implements ArgumentMatcherAction {
private final List<ArgumentMatcher<?>> matchers = new ArrayList<ArgumentMatcher<?>>();

@Override
public boolean apply(ArgumentMatcher<?> matcher, Object argument) {
Expand Down