Fix equality check bug in ExpressionKey #363
Merged
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
stakx
commented
Jun 5, 2017
Source/Interceptor.cs
Outdated
| { | ||
| if (value != null) | ||
| { | ||
| hash = unchecked((hash * 397) ^ value.GetHashCode()); |
There was a problem hiding this comment.
We don't care whether the hash value overflows or not, but we do not want overflows to trigger an exception. That is why unchecked is necessary here.
stakx
force-pushed
the
expressionkey-equality
branch
from
45e8b0f
to
4a2c2ac
Compare
The equality check in ExpressionKey is wrong. The check must be conjunction (&), but not disjunction(|), because then the values don't matter in that check and they are just skipped. So, invocations: aMock.Setup(m => m.Foo(i1, i2)); aMock.Setup(m => m.Foo(i2, i1)); have the same expression key, but this is not correct.
1. Fix `ExpressionKey.Equals` so that it works correctly for boxed
value types (by using object.Equals instead of ==).
2. Update the test code (xUnit no longer has `Assert.DoesNotThrow`).
Issue 328 revealed that ExpressionKey did not perform equality check- ing correctly for objects with the same hash code. This commit adds tests for that specific scenario.
stakx
force-pushed
the
expressionkey-equality
branch
from
4a2c2ac
to
829804b
Compare
This was referenced Jun 15, 2017
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 PR is a cleaned-up version of #134. It fixes the buggy
EqualsandGetHashCodeimplementations inInterceptor.ExpressionKey.This closes #135, and closes #328, and closes #374.