Handle Kotlin sources in MockitoWhenOnStaticToMockStatic#1003
Merged
Conversation
timtebeek
approved these changes
May 20, 2026
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.
Summary
ClassCastExceptionwhenMockitoWhenOnStaticToMockStaticruns on Kotlin sources containingMockito.when(StaticClass.staticMethod(...))(reported by Sunbit; blocksUpgradeSpringBoot_4_0).mockStatic(X::class.java).use { ... }as the wrapping scope and rewrites the innerMockito.when(X.static())to callwhenon the lambda parameter (handles both implicititand named parameter):MockedStatic<X>property (e.g.lateinit varset in@BeforeEach) when present.Out of scope (deliberately): the fresh-wrap case for Kotlin (no enclosing
.useand no class-levelMockedStaticproperty). The recipe now degrades to a no-op for that case instead of crashing; the structural Kotlin equivalent of the JavatryWithMockedStaticpath will be a follow-up.Resolves moderneinc/customer-requests#2400.
Test plan
./gradlew test --tests "*MockitoWhenOnStaticToMockStaticTest*"passes, including the five new Kotlin tests:shouldRewriteKotlinMockitoWhenInsideMockStaticUseWithImplicitIt(Sunbit reproducer)shouldRewriteKotlinMockitoWhenInsideMockStaticUseWithNamedParamshouldRewriteKotlinMockitoWhenWithMultipleStatementsInUseBlockshouldRewriteKotlinMockitoWhenWithClassLevelMockedStaticPropertyshouldNotRewriteKotlinMockitoWhenWhenStaticClassDoesNotMatchUseReceiver./gradlew test(full suite) green.