Skip to content

Commit d670dee

Browse files
committed
Update to latest rewrite core
1 parent c98b11e commit d670dee

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
6262
return m;
6363
}
6464
doAfterVisit(new ChangeMethodTargetToStatic("org.junit.Assert " + m.getSimpleName() + "(..)",
65-
"org.junit.jupiter.api.Assertions", null));
65+
"org.junit.jupiter.api.Assertions", null, null));
6666
List<Expression> args = m.getArguments();
6767
Expression firstArg = args.get(0);
6868
// Suppress arg-switching for Assertions.assertEquals(String, String)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.openrewrite.java.JavaTemplate;
2525
import org.openrewrite.java.format.AutoFormatVisitor;
2626
import org.openrewrite.java.search.FindAnnotations;
27-
import org.openrewrite.java.search.FindFields;
27+
import org.openrewrite.java.search.FindFieldsOfType;
2828
import org.openrewrite.java.search.UsesType;
2929
import org.openrewrite.java.tree.J;
3030
import org.openrewrite.java.tree.Statement;
@@ -99,8 +99,8 @@ public static class MockitoRuleToMockitoExtensionVisitor extends JavaIsoVisitor<
9999
@Override
100100
public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
101101
J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
102-
Set<J.VariableDeclarations> mockitoFields = FindFields.find(cd, "org.mockito.junit.MockitoRule");
103-
mockitoFields.addAll(FindFields.find(cd, "org.mockito.junit.MockitoTestRule"));
102+
Set<J.VariableDeclarations> mockitoFields = FindFieldsOfType.find(cd, "org.mockito.junit.MockitoRule");
103+
mockitoFields.addAll(FindFieldsOfType.find(cd, "org.mockito.junit.MockitoTestRule"));
104104

105105
if (!mockitoFields.isEmpty()) {
106106
List<Statement> statements = new ArrayList<>(cd.getBody().getStatements());

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public static class MockUtilsToStaticVisitor extends JavaVisitor<ExecutionContex
6464
private static final MethodMatcher METHOD_MATCHER = new MethodMatcher("org.mockito.internal.util.MockUtil MockUtil()");
6565
private final ChangeMethodTargetToStatic changeMethodTargetToStatic = new ChangeMethodTargetToStatic(
6666
"org.mockito.internal.util.MockUtil *(..)",
67-
"org.mockito.internal.util.MockUtil", null
67+
"org.mockito.internal.util.MockUtil",
68+
null, null
6869
);
6970

7071
@Override

0 commit comments

Comments
 (0)