Added implementation to extract any expression arguments from last statement in assertThrows #724
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
…OnLastStatement.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…OnLastStatement.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…OnLastStatementTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Laurens-W
reviewed
May 9, 2025
src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java
Outdated
Show resolved
Hide resolved
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java
Show resolved
Hide resolved
timtebeek
reviewed
May 9, 2025
Comment on lines
+146
to
+202
| private Statement extractExpressionArguments(Statement methodStatement, Statement lambdaStatement, List<Statement> statements) { | ||
| if (lambdaStatement instanceof J.MethodInvocation) { | ||
| J.MethodInvocation mi = (J.MethodInvocation) lambdaStatement; | ||
| List<Expression> lambdaArguments = new ArrayList<>(mi.getArguments().size()); | ||
| for (Expression e : mi.getArguments()) { | ||
| if (e instanceof J.Identifier || e instanceof J.Literal || e instanceof J.Empty) { | ||
| lambdaArguments.add(e); | ||
| continue; | ||
| } | ||
|
|
||
| JavaTemplate.Builder builder = JavaTemplate.builder("#{} " + getVariableName(e) + " = #{any()};\n") | ||
| .javaParser(JavaParser.fromJavaVersion().classpath(JavaParser.runtimeClasspath()).logCompilationWarningsAndErrors(true)); | ||
|
|
||
| Object type = "Object"; | ||
| if (e.getType() instanceof JavaType.Primitive) { | ||
| type = e.getType().toString(); | ||
| } else if (e.getType() != null && TypeUtils.asClass(e.getType()) != null) { | ||
| type = TypeUtils.asClass(e.getType()).getClassName(); | ||
| maybeAddImport(TypeUtils.asFullyQualified(e.getType()).getFullyQualifiedName(), false); | ||
| } | ||
|
|
||
| J.VariableDeclarations varDecl = new J.VariableDeclarations(Tree.randomId(), | ||
| Space.EMPTY, | ||
| Markers.EMPTY, | ||
| Collections.emptyList(), | ||
| Collections.emptyList(), | ||
| new J.Identifier(Tree.randomId(), | ||
| Space.EMPTY, | ||
| Markers.EMPTY, | ||
| Collections.emptyList(), | ||
| type.toString(), | ||
| e.getType(), | ||
| null), | ||
| null, | ||
| Collections.emptyList(), | ||
| Arrays.asList(JRightPadded.build(new J.VariableDeclarations.NamedVariable(Tree.randomId(), | ||
| Space.SINGLE_SPACE, | ||
| Markers.EMPTY, | ||
| new J.Identifier(Tree.randomId(), | ||
| Space.EMPTY, | ||
| Markers.EMPTY, | ||
| Collections.emptyList(), | ||
| getVariableName(e), | ||
| e.getType(), | ||
| new JavaType.Variable(null, 0, getVariableName(e), null, e.getType(), null)), | ||
| Collections.emptyList(), | ||
| JLeftPadded.build((Expression)e.withPrefix(Space.SINGLE_SPACE)).withBefore(Space.SINGLE_SPACE), | ||
| new JavaType.Variable(null, 0, getVariableName(e), null, e.getType(), null))))); | ||
|
|
||
| J.Identifier name = varDecl.getVariables().get(0).getName(); | ||
| statements.add(varDecl.withPrefix(methodStatement.getPrefix().withComments(emptyList()))); | ||
| lambdaArguments.add(name); | ||
| } | ||
| lambdaStatement = mi.withArguments(lambdaArguments); | ||
| } | ||
| return lambdaStatement; | ||
| } |
There was a problem hiding this comment.
as discussed on Slack this was based in part on an example that could be simplified with an anonymous visitor; putting that reminder here to use when reviewing & polishing, as I don't expect you to know what adjustments to make based on that comment alone.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
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?
This PR changes the recipe to extract all
expressionarguments into variables outside theassertThrows()call.What's your motivation?
assertThrows(..)should only contain the expression that is expected to throw.breaks that convention because
getC()could throw.