Replace Mock.InnerMocks
with InnerMockSetup
#760
Merged
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.
Mock.InnerMocks
is the mechanism that mocks use to keep track of subordinate ("inner") mocks for recursive verification. This data structure causes quite a few problems:Having both setups and the
InnerMocks
dictionary for mock members is difficult to understand, especially as the two structures are not necessarily kept in perfect sync.One example of this is when a setup for some mock member has been overridden, but there is still an
InnerMocks
entry for that same member. This typically leads to "unreachable" inner mocks being included in recursive verification when they should no longer be included.InnerMocks
is a simple dictionary keyed by method. Unlike setups, it does not store argument information and is therefore much less precise. There can only be one registered inner mock per method.We can keep track of inner mocks as a special type of setup to solve all of these problems.
This PR takes care of (1) and creates the basis for (2) and (3).