Extract invocation matching logic into InvocationShape
#662
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
This moves all logic from `MethodCall` that is related to invocation
matching into a dedicated new type, `InvocationShape`. This seems use-
ful mainly because of two reasons:
1. The invocation matching becomes more easily testable once it is
better isolated.
2. Verification methods such as `mock.Verify(expression)` no longer
need to instantiate a transient `MethodCall` (which at its heart
really represents a setup) in order to match invocations. They
will be able to use the much lighter-weight `InvocationShape` in-
stead.
If we want to be able to use `InvocationShape` in verification methods as well (as described in the previous commit message), it's likely that this type will have to be able to accept arguments, instead of argument matchers. Therefore, extract that logic from `MethodCall` and move it into `InvocationShape'.
Rewrite the match conditions in such a way that the positive match al- ways happens at the methods' end; all earlier conditions lead to an early return and a negative match. This makes the changed methods somewhat easier to read.
This realises one of the two benefits claimed in an earlier commit message: verification methods are modified to use `InvocationShape` instead of newing up transient `MethodCall` instances (which represent setups and are much heavier-weight).
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.
This refactoring moves all logic from
MethodCallthat is related to invocation matching into a dedicated new type,InvocationShape. This is useful mainly because of two reasons:The invocation matching becomes more easily testable once it is better isolated.
Verification methods such as
mock.Verify(expression)no longer need to instantiate a transientMethodCall(which at its heart really represents a setup) in order to match invocations. They will be able to use the much lighter-weightInvocationShapeinstead.