Fix verifier logic for slots and different matchers #951
Conversation
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
m-burst
commented
Oct 21, 2022
Comment on lines
+58
to
+60
| val matchedCalls = allCallsForMockMethod.filter(matcher::match) | ||
|
|
||
| if(matchedCalls.size > 1 && matcher.args.any { it is CapturingSlotMatcher<*> }) { |
There was a problem hiding this comment.
It's OK if there are multiple calls overall but only one of them matches and will be captured
m-burst
commented
Oct 21, 2022
| @@ -162,7 +163,7 @@ open class UnorderedCallVerifier( | |||
| } | |||
|
|
|||
| captureBlocks.add { | |||
| for (call in allCallsForMockMethod) { | |||
| for (call in matchedCalls) { | |||
There was a problem hiding this comment.
captureAnswer was called for non-matched calls, which led to incorrect capturing results
m-burst
commented
Oct 21, 2022
Comment on lines
-88
to
-89
| mock.doSomething("1", capture(dataSlotId1)) | ||
| mock.doSomething("2", capture(dataSlotId2)) |
There was a problem hiding this comment.
This would not fail if left as is, because with different values of the first argument only 1 call will be matched in each case
m-burst
commented
Oct 21, 2022
Comment on lines
+139
to
+140
| // Each capture should have happened once because of different matchers for `id` argument | ||
| assertEquals(slotList.size, 2) |
There was a problem hiding this comment.
Previously this was 4
|
Brilliant, thanks a lot for fixing this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #774