Fix eq() matcher NPE with nullable value class and null value#579
Merged
TimvdLippe merged 1 commit intomockito:mainfrom Jan 20, 2026
Merged
Fix eq() matcher NPE with nullable value class and null value#579TimvdLippe merged 1 commit intomockito:mainfrom
TimvdLippe merged 1 commit intomockito:mainfrom
Conversation
2 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #577
I took #578 as starting point, but it turned out that the provided tests did not actually fail when
eq()is called with an inline value null. In that case theT::classin eq() is then equal toKClass<Void>.After casting the null value in the tests explicity to
ValueClass?/LongValueClass?, the tests started to exhibit the NPE.I decided to take a slightly different turn in the actual main line fix: I've added the null check to
eq().The
eqValueClass()function has only be introduced with release 6.2.0, so I felt it appropriate to reduce the typeParameter of the function toT: Any, so it only accepts non-null values onwards.