-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JUnit4 SpringClassRule and SpringMethodRule to SpringExtension (#571)
* Add recipe that migrates from SpringClassRule and SpringMethodRule to @ExtendWith(SpringExtension.class) or fares on an existing @SpringBootTest Solves #567 * Formatting and include with SpringBoot2JUnit4to5Migration * Apply github actions suggestions * Drop junit classpath entry used in tests only * Show and limitation of having only one field * Use annotation matcher for meta annotations * Group recipes logically under SpringBoot2JUnit4to5Migration * Fix header year --------- Co-authored-by: Laurens Westerlaken <[email protected]> Co-authored-by: Tim te Beek <[email protected]>
- Loading branch information
1 parent
b15c38a
commit 729164f
Showing
4 changed files
with
252 additions
and
0 deletions.
There are no files selected for viewing
94 changes: 94 additions & 0 deletions
94
src/main/java/org/openrewrite/java/spring/test/SpringRulesToJUnitExtension.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* | ||
* Copyright 2024 the original author or authors. | ||
* <p> | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* <p> | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* <p> | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.openrewrite.java.spring.test; | ||
|
||
import org.openrewrite.ExecutionContext; | ||
import org.openrewrite.Preconditions; | ||
import org.openrewrite.Recipe; | ||
import org.openrewrite.TreeVisitor; | ||
import org.openrewrite.java.AnnotationMatcher; | ||
import org.openrewrite.java.JavaIsoVisitor; | ||
import org.openrewrite.java.JavaParser; | ||
import org.openrewrite.java.JavaTemplate; | ||
import org.openrewrite.java.search.UsesType; | ||
import org.openrewrite.java.tree.J; | ||
import org.openrewrite.java.tree.TypeUtils; | ||
|
||
import static java.util.Comparator.comparing; | ||
|
||
public class SpringRulesToJUnitExtension extends Recipe { | ||
|
||
private static final String SPRING_CLASS_RULE = "org.springframework.test.context.junit4.rules.SpringClassRule"; | ||
private static final String SPRING_METHOD_RULE = "org.springframework.test.context.junit4.rules.SpringMethodRule"; | ||
private static final String EXTEND_WITH = "org.junit.jupiter.api.extension.ExtendWith"; | ||
private static final String SPRING_EXTENSION = "org.springframework.test.context.junit.jupiter.SpringExtension"; | ||
private static final AnnotationMatcher ANNOTATION_MATCHER = new AnnotationMatcher(String.format("@%s(%s.class)", EXTEND_WITH, SPRING_EXTENSION), true); | ||
|
||
|
||
@Override | ||
public String getDisplayName() { | ||
return "Replace `SpringClassRule` and `SpringMethodRule` with JUnit 5 `SpringExtension`"; | ||
} | ||
|
||
@Override | ||
public String getDescription() { | ||
return "Replace JUnit 4's `SpringClassRule` and `SpringMethodRule` with JUnit 5's `SpringExtension` or rely on an existing `@SpringBootTest`."; | ||
} | ||
|
||
@Override | ||
public TreeVisitor<?, ExecutionContext> getVisitor() { | ||
return Preconditions.check( | ||
Preconditions.or( | ||
new UsesType<>(SPRING_CLASS_RULE, true), | ||
new UsesType<>(SPRING_METHOD_RULE, true) | ||
), | ||
new JavaIsoVisitor<ExecutionContext>() { | ||
@Override | ||
public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) { | ||
J.VariableDeclarations vd = super.visitVariableDeclarations(multiVariable, ctx); | ||
if (TypeUtils.isOfClassType(vd.getTypeAsFullyQualified(), SPRING_CLASS_RULE) || | ||
TypeUtils.isOfClassType(vd.getTypeAsFullyQualified(), SPRING_METHOD_RULE)) { | ||
maybeRemoveImport(SPRING_CLASS_RULE); | ||
maybeRemoveImport(SPRING_METHOD_RULE); | ||
maybeRemoveImport("org.junit.ClassRule"); | ||
maybeRemoveImport("org.junit.Rule"); | ||
|
||
doAfterVisit(new JavaIsoVisitor<ExecutionContext>() { | ||
@Override | ||
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) { | ||
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx); | ||
if (cd.getLeadingAnnotations().stream().noneMatch(ANNOTATION_MATCHER::matches)) { | ||
maybeAddImport(EXTEND_WITH); | ||
maybeAddImport(SPRING_EXTENSION); | ||
return JavaTemplate.builder("@ExtendWith(SpringExtension.class)") | ||
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api", "spring-test")) | ||
.imports(EXTEND_WITH, SPRING_EXTENSION) | ||
.build() | ||
.apply(getCursor(), cd.getCoordinates().addAnnotation(comparing(J.Annotation::getSimpleName))); | ||
|
||
} | ||
return cd; | ||
} | ||
}); | ||
|
||
//noinspection DataFlowIssue | ||
return null; | ||
} | ||
return vd; | ||
} | ||
}); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
src/main/java/org/openrewrite/java/spring/test/package-info.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/* | ||
* Copyright 2024 the original author or authors. | ||
* <p> | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* <p> | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* <p> | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
@NonNullApi @NonNullFields | ||
package org.openrewrite.java.spring.test; | ||
|
||
import org.openrewrite.internal.lang.NonNullApi; | ||
import org.openrewrite.internal.lang.NonNullFields; |
This file contains 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
137 changes: 137 additions & 0 deletions
137
src/test/java/org/openrewrite/java/spring/test/SpringRulesToJUnitExtensionTest.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
/* | ||
* Copyright 2024 the original author or authors. | ||
* <p> | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* <p> | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* <p> | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.openrewrite.java.spring.test; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.openrewrite.DocumentExample; | ||
import org.openrewrite.InMemoryExecutionContext; | ||
import org.openrewrite.java.JavaParser; | ||
import org.openrewrite.test.RecipeSpec; | ||
import org.openrewrite.test.RewriteTest; | ||
|
||
import static org.openrewrite.java.Assertions.java; | ||
|
||
class SpringRulesToJUnitExtensionTest implements RewriteTest { | ||
|
||
@Override | ||
public void defaults(RecipeSpec spec) { | ||
spec.recipe(new SpringRulesToJUnitExtension()) | ||
.parser(JavaParser.fromJavaVersion() | ||
.classpathFromResources(new InMemoryExecutionContext(), "spring-boot-test", "spring-test") | ||
.dependsOn("package org.junit; public @interface ClassRule {}", "package org.junit; public @interface Rule {}") | ||
); | ||
} | ||
|
||
@Test | ||
@DocumentExample | ||
void migrateWithSpringBootTestPresent() { | ||
rewriteRun( | ||
//language=java | ||
java( | ||
""" | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
import org.springframework.test.context.junit4.rules.SpringClassRule; | ||
import org.springframework.test.context.junit4.rules.SpringMethodRule; | ||
import org.junit.ClassRule; | ||
import org.junit.Rule; | ||
@SpringBootTest | ||
class SomeTest { | ||
@ClassRule | ||
public static final SpringClassRule springClassRule = new SpringClassRule(); | ||
@Rule | ||
public final SpringMethodRule springMethodRule = new SpringMethodRule(); | ||
} | ||
""", | ||
""" | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
@SpringBootTest | ||
class SomeTest { | ||
} | ||
""" | ||
) | ||
); | ||
} | ||
|
||
@Test | ||
void migrateSingleAnnotation() { | ||
rewriteRun( | ||
//language=java | ||
java( | ||
""" | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
import org.springframework.test.context.junit4.rules.SpringMethodRule; | ||
import org.junit.Rule; | ||
@SpringBootTest | ||
class SomeTest { | ||
@Rule | ||
public final SpringMethodRule springMethodRule = new SpringMethodRule(); | ||
} | ||
""", | ||
""" | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
@SpringBootTest | ||
class SomeTest { | ||
} | ||
""" | ||
) | ||
); | ||
} | ||
|
||
@Test | ||
void migrateAndAddSpringExtension() { | ||
rewriteRun( | ||
//language=java | ||
java( | ||
""" | ||
import org.springframework.test.context.junit4.rules.SpringClassRule; | ||
import org.springframework.test.context.junit4.rules.SpringMethodRule; | ||
import org.junit.ClassRule; | ||
import org.junit.Rule; | ||
class SomeTest { | ||
@ClassRule | ||
public static final SpringClassRule springClassRule = new SpringClassRule(); | ||
@Rule | ||
public final SpringMethodRule springMethodRule = new SpringMethodRule(); | ||
} | ||
""", | ||
""" | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.springframework.test.context.junit.jupiter.SpringExtension; | ||
@ExtendWith(SpringExtension.class) | ||
class SomeTest { | ||
} | ||
""" | ||
) | ||
); | ||
} | ||
} |