forked from mockito/mockito
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue mockito#1222 and mockito#584
Adds a new method varargsAsArray(...) that indicates that the varargs should be matched/captured as a single array rather than separate values.
- Loading branch information
1 parent
e10c540
commit be0cd33
Showing
9 changed files
with
274 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/main/java/org/mockito/internal/matchers/TreatVarargsAsArray.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright (c) 2017 Mockito contributors | ||
* This program is made available under the terms of the MIT License. | ||
*/ | ||
package org.mockito.internal.matchers; | ||
|
||
import org.mockito.ArgumentMatcher; | ||
import org.mockito.internal.matchers.text.MatcherToString; | ||
import java.io.Serializable; | ||
|
||
/** | ||
* Wraps an {@link ArgumentMatcher} and indicates that it should be passed the varargs as a single | ||
* array rather than individual values. | ||
*/ | ||
public class TreatVarargsAsArray<T> | ||
implements ArgumentMatcher<T>, ContainsExtraTypeInfo, CapturesArguments, Serializable { | ||
|
||
private final ArgumentMatcher<? super T> delegate; | ||
|
||
public TreatVarargsAsArray(ArgumentMatcher<? super T> delegate) { | ||
this.delegate = delegate; | ||
} | ||
|
||
@Override | ||
public boolean matches(T argument) { | ||
return delegate.matches(argument); | ||
} | ||
|
||
@Override | ||
public void captureFrom(Object argument) { | ||
if (delegate instanceof CapturesArguments) { | ||
((CapturesArguments) delegate).captureFrom(argument); | ||
} | ||
} | ||
|
||
@Override | ||
public String toStringWithType() { | ||
if (delegate instanceof ContainsExtraTypeInfo) { | ||
String delagateAsString = ((ContainsExtraTypeInfo) delegate).toStringWithType(); | ||
return wrapString(delagateAsString); | ||
} | ||
return toString(); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
String delegateAsString = MatcherToString.toString(delegate); | ||
return wrapString(delegateAsString); | ||
} | ||
|
||
private String wrapString(String delegateAsString) { | ||
return "varargsAsArray(" + delegateAsString + ")"; | ||
} | ||
|
||
@Override | ||
public boolean typeMatches(Object target) { | ||
if (delegate instanceof ContainsExtraTypeInfo) { | ||
return ((ContainsExtraTypeInfo) delegate).typeMatches(target); | ||
} | ||
return true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,4 +26,5 @@ public interface ArgumentMatcherStorage { | |
|
||
void reset(); | ||
|
||
ArgumentMatcher<?> popMatcher(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
src/test/java/org/mockito/internal/matchers/TreatVarargsAsArrayTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
package org.mockito.internal.matchers; | ||
|
||
import org.junit.Test; | ||
|
||
import static junit.framework.TestCase.assertTrue; | ||
import static org.junit.Assert.assertArrayEquals; | ||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertFalse; | ||
|
||
public class TreatVarargsAsArrayTest { | ||
|
||
@Test | ||
public void delegateDoesNotImplementCapturesArgument_captureFrom() { | ||
TreatVarargsAsArray<String[]> matcher = new TreatVarargsAsArray<String[]>( | ||
new Equals(new String[] {"1"})); | ||
|
||
// Should not do anything. | ||
matcher.captureFrom("2"); | ||
} | ||
|
||
@Test | ||
public void delegateDoesImplementCapturesArgument_captureFrom() { | ||
CapturingMatcher<String[]> capturingMatcher = new CapturingMatcher<String[]>(); | ||
TreatVarargsAsArray<String[]> matcher = | ||
new TreatVarargsAsArray<String[]>(capturingMatcher); | ||
|
||
// Should not do anything. | ||
matcher.captureFrom(new String[] {"2"}); | ||
|
||
assertArrayEquals(new String[] {"2"}, capturingMatcher.getLastValue()); | ||
} | ||
|
||
@Test | ||
public void delegateDoesNotImplementContainsExtraTypeInfo_toStringWithType() { | ||
TreatVarargsAsArray<String[]> matcher = new TreatVarargsAsArray<String[]>(NotNull.NOT_NULL); | ||
|
||
assertEquals("varargsAsArray(notNull())", matcher.toStringWithType()); | ||
} | ||
|
||
@Test | ||
public void delegateDoesImplementContainsExtraTypeInfo_toStringWithType() { | ||
TreatVarargsAsArray<String[]> matcher = new TreatVarargsAsArray<String[]>( | ||
new Equals(new String[] {"1"})); | ||
|
||
assertEquals("varargsAsArray((String[]) [\"1\"])", matcher.toStringWithType()); | ||
} | ||
|
||
@Test | ||
public void delegateDoesNotImplementContainsExtraTypeInfo_typeMatches() { | ||
TreatVarargsAsArray<String[]> matcher = new TreatVarargsAsArray<String[]>(NotNull.NOT_NULL); | ||
|
||
assertTrue(matcher.typeMatches(new String[] {})); | ||
assertTrue(matcher.typeMatches(1)); | ||
} | ||
|
||
@Test | ||
public void delegateDoesImplementContainsExtraTypeInfo_typeMatches() { | ||
TreatVarargsAsArray<String[]> matcher = new TreatVarargsAsArray<String[]>( | ||
new Equals(new String[] {"1"})); | ||
|
||
assertTrue("String[]", matcher.typeMatches(new String[] {})); | ||
assertFalse("int", matcher.typeMatches(1)); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.