Fix variable name conflict in JMockit to Mockito migration #865
+230
−11
Conversation
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
When migrating JMockit `Expectations` blocks to Mockito, variables declared inside the block that have the same names as variables later in the test method now stay accessible to the generated `when()` calls. ### Changes - Modified `SetupStatementsRewriter` to skip setup statement extraction when there's a variable name conflict - Updated `JMockitBlockRewriter` to track and preserve setup statements within mock invocation groups - Added `wrapStatementsInBlock()` to wrap both setup statements and `when()` calls in the same block - Updated `setupStatementVariableNameConflict` test to reflect the corrected behavior - Added new test `setupStatementVariableUsedInResultAndTestCode` for issue #844 ### Before (broken) ```java { String res = "mockedValue"; } when(config.getValue()).thenReturn(res); // error: res not in scope ``` ### After (fixed) ```java { String res = "mockedValue"; when(config.getValue()).thenReturn(res); } ``` Fixes: - #844
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
src/main/java/org/openrewrite/java/testing/jmockit/JMockitBlockRewriter.java
Outdated
Show resolved
Hide resolved
src/main/java/org/openrewrite/java/testing/jmockit/JMockitBlockRewriter.java
Outdated
Show resolved
Hide resolved
github-project-automation
bot
moved this from In Progress
to Ready to Review
in OpenRewrite
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.
When migrating JMockit
Expectationsblocks to Mockito, variables declared inside the block that have the same names as variables later in the test method now stay accessible to the generatedwhen()calls.Changes
SetupStatementsRewriterto skip setup statement extraction when there's a variable name conflictJMockitBlockRewriterto track and preserve setup statements within mock invocation groupswrapStatementsInBlock()to wrap both setup statements andwhen()calls in the same blocksetupStatementVariableNameConflicttest to reflect the corrected behaviorsetupStatementVariableUsedInResultAndTestCodefor issue Still Variable name conflict in JmockitToMockito #844Before (broken)
{ String res = "mockedValue"; } when(config.getValue()).thenReturn(res); // error: res not in scopeAfter (fixed)
{ String res = "mockedValue"; when(config.getValue()).thenReturn(res); }