Skip to content

Commit a0b46cf

Browse files
committed
Applicable tests
1 parent a7910f5 commit a0b46cf

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

src/main/java/org/openrewrite/java/testing/junit5/CleanupJUnitImports.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
import org.openrewrite.ExecutionContext;
1919
import org.openrewrite.Recipe;
2020
import org.openrewrite.TreeVisitor;
21+
import org.openrewrite.internal.lang.Nullable;
2122
import org.openrewrite.java.JavaIsoVisitor;
23+
import org.openrewrite.java.JavaVisitor;
24+
import org.openrewrite.java.search.UsesType;
2225
import org.openrewrite.java.tree.J;
2326

2427
public class CleanupJUnitImports extends Recipe {
@@ -37,6 +40,19 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
3740
return new CleanupJUnitImportsVisitor();
3841
}
3942

43+
@Nullable
44+
@Override
45+
protected JavaVisitor<ExecutionContext> getSingleSourceApplicableTest() {
46+
return new JavaVisitor<ExecutionContext>() {
47+
@Override
48+
public J visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
49+
doAfterVisit(new UsesType<>("org.junit.*"));
50+
doAfterVisit(new UsesType<>("junit.*"));
51+
return cu;
52+
}
53+
};
54+
}
55+
4056
public static class CleanupJUnitImportsVisitor extends JavaIsoVisitor<ExecutionContext> {
4157
@Override
4258
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {

src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,14 @@ protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
7676

7777
@Override
7878
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext executionContext) {
79-
J.CompilationUnit c = cu;
80-
for (J.ClassDeclaration clazz : c.getClasses()) {
79+
for (J.ClassDeclaration clazz : cu.getClasses()) {
8180
if (TypeUtils.isAssignableTo(JavaType.Class.build("junit.framework.TestCase"), clazz.getType())) {
82-
c = c.withMarkers(c.getMarkers().addIfAbsent(FOUND_TYPE));
81+
return cu.withMarkers(cu.getMarkers().addIfAbsent(FOUND_TYPE));
8382
}
8483
}
8584

8685
doAfterVisit(new UsesType<>("junit.framework.TestCase"));
87-
return c;
86+
return cu;
8887
}
8988
};
9089
}

src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
import org.openrewrite.ExecutionContext;
1919
import org.openrewrite.Recipe;
2020
import org.openrewrite.TreeVisitor;
21+
import org.openrewrite.internal.lang.Nullable;
2122
import org.openrewrite.java.JavaIsoVisitor;
2223
import org.openrewrite.java.OrderImports;
24+
import org.openrewrite.java.search.UsesType;
2325
import org.openrewrite.java.tree.J;
2426

2527
/**
@@ -41,6 +43,12 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
4143
return new CleanupMockitoImportsVisitor();
4244
}
4345

46+
@Nullable
47+
@Override
48+
protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
49+
return new UsesType<>("org.mockito.*");
50+
}
51+
4452
public static class CleanupMockitoImportsVisitor extends JavaIsoVisitor<ExecutionContext> {
4553
@Override
4654
public J.Import visitImport(J.Import _import, ExecutionContext executionContext) {

0 commit comments

Comments
 (0)