Repository navigation
Conversation
timtebeek
self-requested a review
September 28, 2026 16:43
…d static imports Calls through static imports of Mockito or BDDMockito are attributed to that class, so key the matcher renames on org.mockito.* instead of duplicating them per class. CleanupMockitoImports now takes a static import's owner from the typed import target, as J.Import#getTypeName() fails to find methods inherited from Matchers once that type is changed to ArgumentMatchers, which removed still used static imports.
timtebeek
approved these changes
Sep 28, 2026
timtebeek
left a comment
Member
There was a problem hiding this comment.
Thanks a lot for the help here @mohitduhan19 ! I've made some small adjustments to pick up additional migrations. Should make it into the next release, but you can already build from source to use the snapshot.
Contributor
Author
|
Thanks for the review and for extending the fix to cover the additional migrations, @timtebeek! Much appreciated, and glad to see this in main. Looking forward to contributing more. |
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
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.
What's changed?
In Mockito 1.x
MockitoextendsMatchers, so matchers used throughorg.mockito.Mockito(typically viaimport static org.mockito.Mockito.*) are attributed toMockito, notMatchers. TheChangeTypefromMatcherstoArgumentMatchersand the renames keyed onArgumentMatcherstherefore skip them, which leaves calls likeanyListOf(String.class)uncompilable on Mockito 5.org.mockito.MockitoforanyVararg,anyListOf,anySetOf,anyMapOf,anyCollectionOfandanyIterableOf, plus the matchingDeleteMethodArgumentsteps. It follows the existingorg.mockito.Mockito anyObject()alias added in fix: add Mockito.anyObject() alias to Mockito 1-to-3 migration #842.What's your motivation?
import static org.mockito.Mockito.*#1115Checklist
handlesAnyXOfFromMockitoWildCardImport, which fails without the change and passes with it.Mockito1to3MigrationTestpasses locally.