Finish moving JavaParserBuilder.classpath() to JavaParserBuilder.classpathFromResources()

Author: sambsnyd

build.gradle.kts

@@ -12,6 +12,7 @@ description = "A rewrite module automating best practices and major version migr
 recipeDependencies {
     parserClasspath("org.assertj:assertj-core:3.+")
     parserClasspath("junit:junit:latest.release")
+    parserClasspath("pl.pragmatists:JUnitParams:1.+")
     parserClasspath("org.junit.platform:junit-platform-suite-api:latest.release")
     parserClasspath("org.junit.jupiter:junit-jupiter-api:latest.release")
     parserClasspath("org.junit.jupiter:junit-jupiter-params:latest.release")
@@ -42,21 +43,4 @@ dependencies {
 
     testImplementation("org.openrewrite:rewrite-java-17:$rewriteVersion")
     testImplementation("org.openrewrite:rewrite-groovy:$rewriteVersion")
-    testRuntimeOnly("com.github.tomakehurst:wiremock-jre8:latest.release")
-
-    // "Before" framework dependencies
-    testRuntimeOnly("junit:junit:latest.release")
-    testRuntimeOnly("org.springframework:spring-test:4.+")
-    testRuntimeOnly("pl.pragmatists:JUnitParams:1.+")
-    testRuntimeOnly("com.squareup.okhttp3:mockwebserver:3.+")
-    testRuntimeOnly("org.testng:testng:6.8")
-    testRuntimeOnly("io.cucumber:cucumber-java8:7.+")
-    testRuntimeOnly("io.cucumber:cucumber-java:7.+")
-    testRuntimeOnly("io.cucumber:cucumber-plugin:7.+")
-    testRuntimeOnly("io.cucumber:cucumber-junit-platform-engine:7.+")
-    testRuntimeOnly("org.junit.platform:junit-platform-suite-api:latest.release")
-    testRuntimeOnly("ch.qos.logback:logback-classic:latest.release")
-    testRuntimeOnly("com.squareup.okhttp3:mockwebserver:3.14.9")
-    testRuntimeOnly("org.powermock:powermock-api-mockito:1.7.+")
-    testRuntimeOnly("org.mockito:mockito-core:3.+")
 }

src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java

@@ -39,11 +39,6 @@ public String getDisplayName() {
         return "JUnit `assertEquals` to AssertJ";
     }
 
-  @Override
-  public Duration getEstimatedEffortPerOccurrence() {
-    return Duration.ofMinutes(5);
-  }
-
     @Override
     public String getDescription() {
         return "Convert JUnit-style `assertEquals()` to AssertJ's `assertThat().isEqualTo()`.";

src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java

@@ -126,7 +126,6 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
         }
 
         private static class UnqualifiedMethodInvocations extends JavaIsoVisitor<ExecutionContext> {
-            private final Supplier<JavaParser> ASSERTJ_JAVA_PARSER = () -> JavaParser.fromJavaVersion().classpath("assertj-core").build();
             private static final MethodMatcher ASSERTJ_FAIL_MATCHER = new MethodMatcher("org.assertj.core.api.Assertions" + " fail(..)");
 
             @Override
@@ -147,7 +146,9 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
 
                 method = method.withTemplate(JavaTemplate.builder(this::getCursor, templateBuilder.toString())
                                 .staticImports("org.assertj.core.api.Assertions" + ".fail")
-                                .javaParser(ASSERTJ_JAVA_PARSER)
+                                .javaParser(() -> JavaParser.fromJavaVersion()
+                                        .classpathFromResources(executionContext, "assertj-core-3.24.2")
+                                        .build())
                                 .build(),
                         method.getCoordinates().replace(),
                         arguments.toArray()

src/main/resources/META-INF/rewrite/classpath/JUnitParams-1.1.1.jar

@@ -16,6 +16,7 @@
 package org.openrewrite.java.testing.assertj;
 
 import org.junit.jupiter.api.Test;
+import org.openrewrite.InMemoryExecutionContext;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
@@ -29,7 +30,8 @@ class JUnitAssertArrayEqualsToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("junit"))
+          .parser(JavaParser.fromJavaVersion()
+            .classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api-5.9.+"))
           .recipe(new JUnitAssertArrayEqualsToAssertThat());
     }
 
@@ -39,7 +41,7 @@ void singleStaticMethodNoMessage() {
         rewriteRun(
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
@@ -56,7 +58,7 @@ private Integer[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;
 
@@ -83,7 +85,7 @@ void singleStaticMethodWithMessageLambda() {
           spec -> spec.typeValidationOptions(TypeValidation.none()),
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
@@ -98,7 +100,7 @@ private int[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;
 
@@ -122,7 +124,7 @@ void doublesWithinNoMessage() {
         rewriteRun(
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
@@ -138,7 +140,7 @@ private double[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;
               import static org.assertj.core.api.Assertions.within;
@@ -165,7 +167,7 @@ void doublesWithinAndWithMessage() {
           spec -> spec.typeValidationOptions(TypeValidation.none()),
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
@@ -180,7 +182,7 @@ private double[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;
               import static org.assertj.core.api.Assertions.within;
@@ -206,7 +208,7 @@ void doublesObjectsWithMessage() {
           spec -> spec.typeValidationOptions(TypeValidation.none()),
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
@@ -221,7 +223,7 @@ private Double[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;
 
@@ -245,10 +247,10 @@ void floatCloseToWithNoMessage() {
         rewriteRun(
           java(
             """
-              import org.junit.Test;
-
+              import org.junit.jupiter.api.Test;
+              
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-
+              
               public class MyTest {
                   @Test
                   public void test() {
@@ -260,11 +262,11 @@ private float[] notification() {
               }
               """,
             """
-              import org.junit.Test;
-
+              import org.junit.jupiter.api.Test;
+              
               import static org.assertj.core.api.Assertions.assertThat;
               import static org.assertj.core.api.Assertions.within;
-
+              
               public class MyTest {
                   @Test
                   public void test() {
@@ -286,7 +288,7 @@ void floatCloseToWithMessage() {
           spec -> spec.typeValidationOptions(TypeValidation.none()),
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
@@ -301,7 +303,7 @@ private float[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;
               import static org.assertj.core.api.Assertions.within;
@@ -327,7 +329,7 @@ void fullyQualifiedMethodWithMessage() {
           spec -> spec.typeValidationOptions(TypeValidation.none()),
           java(
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               public class MyTest {
                   @Test
@@ -341,7 +343,7 @@ private String[] notification() {
               }
               """,
             """
-              import org.junit.Test;
+              import org.junit.jupiter.api.Test;
 
               import static org.assertj.core.api.Assertions.assertThat;