Align test names with recipes, group no-change tests and tidy classpath entries and YAML

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

@@ -102,7 +102,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
 
                 JavaTemplate template = JavaTemplate
                     .builder("assertInstanceOf(#{any(java.lang.Class)}, #{any(java.lang.Object)}" + (reason != null ? ", #{any(java.lang.String)})" : ")"))
-                    .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api-5", "junit-4"))
+                    .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api-5"))
                     .staticImports("org.junit.jupiter.api.Assertions.assertInstanceOf")
                     .build();
 

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

@@ -271,7 +271,6 @@ private J.Annotation maybeReplaceTestAnnotation(Cursor anno, @Nullable String pa
                             .javaParser(JavaParser.fromJavaVersion()
                             .classpathFromResources(ctx,
                                     "junit-jupiter-api-5",
-                                    "hamcrest-3",
                                     "junit-jupiter-params-5"))
                             .imports("org.junit.jupiter.params.ParameterizedTest").build()
                             .apply(anno, ((J.Annotation) anno.getValue()).getCoordinates().replace());
@@ -280,7 +279,6 @@ private J.Annotation maybeReplaceTestAnnotation(Cursor anno, @Nullable String pa
                         .javaParser(JavaParser.fromJavaVersion()
                             .classpathFromResources(ctx,
                                 "junit-jupiter-api-5",
-                                "hamcrest-3",
                                 "junit-jupiter-params-5"))
                         .imports("org.junit.jupiter.params.ParameterizedTest").build()
                         .apply(anno, ((J.Annotation) anno.getValue()).getCoordinates().replace(),
@@ -296,7 +294,6 @@ private J.Annotation maybeReplaceParametersAnnotation(Cursor anno, String method
                         .javaParser(JavaParser.fromJavaVersion()
                             .classpathFromResources(ctx,
                                 "junit-jupiter-api-5",
-                                "hamcrest-3",
                                 "junit-jupiter-params-5"))
                         .imports("org.junit.jupiter.params.provider.MethodSource").build();
                 if (initMethods.contains(initMethodName)) {

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

@@ -108,7 +108,7 @@ private J.ClassDeclaration insertTimeoutAnnotation(Expression ex, J.ClassDeclara
                 maybeAddImport("java.util.concurrent.TimeUnit");
                 return JavaTemplate.builder(template)
                         .javaParser(JavaParser.fromJavaVersion()
-                                .classpathFromResources(ctx, "junit-jupiter-api-5", "hamcrest-3"))
+                                .classpathFromResources(ctx, "junit-jupiter-api-5"))
                         .imports("org.junit.jupiter.api.Timeout",
                                 "java.util.concurrent.TimeUnit")
                         .build()

src/main/resources/META-INF/rewrite/assertj.yml

@@ -15,12 +15,10 @@
 #
 
 ---
-
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.assertj.Assertj
 displayName: AssertJ best practices
 description: Migrates JUnit asserts to AssertJ and applies best practices to assertions.
-
 preconditions:
   - org.openrewrite.Singleton
 tags:
@@ -593,8 +591,8 @@ recipeList:
       oldPackageName: org.fest.assertions.data
       newPackageName: org.assertj.core.data
   - org.openrewrite.java.dependencies.ChangeDependency:
-        oldGroupId: org.easytesting
-        oldArtifactId: fest-assert-core
-        newGroupId: org.assertj
-        newArtifactId: assertj-core
-        newVersion: 3.x
+      oldGroupId: org.easytesting
+      oldArtifactId: fest-assert-core
+      newGroupId: org.assertj
+      newArtifactId: assertj-core
+      newVersion: 3.x

src/main/resources/META-INF/rewrite/dbrider.yml

@@ -32,4 +32,3 @@ recipeList:
       oldArtifactId: rider-spring
       newArtifactId: rider-junit5
       newVersion: 1.x
----

src/main/resources/META-INF/rewrite/junit6.yml

@@ -106,7 +106,6 @@ recipeList:
   - org.openrewrite.java.ChangeMethodName:
       methodPattern: org.junit.platform.testkit.engine.Executions started()
       newMethodName: finished
-      matchOverrides: false
       ignoreDefinition: true
   - org.openrewrite.properties.DeleteProperty:
       propertyKey: junit.jupiter.tempdir.scope

src/test/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBooleanTest.java

@@ -110,7 +110,6 @@ void test() {
     @Test
     void assertTrueWithNonBoolean() {
         rewriteRun(
-          spec -> spec.recipe(new AssertEqualsBooleanToAssertBoolean()),
           // language=java
           java(
             """

src/test/java/org/openrewrite/java/testing/junit5/AddJupiterDependenciesTest.java

@@ -44,7 +44,7 @@ void bar() {
     @Override
     public void defaults(RecipeSpec spec) {
         spec.recipe(new AddJupiterDependencies())
-          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api"));
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api-5"));
     }
 
     @DocumentExample

src/test/java/org/openrewrite/java/testing/junit5/MockitoRuleDependencyTest.java → src/test/java/org/openrewrite/java/testing/junit5/AddMockitoJupiterForRulesTest.java

@@ -26,7 +26,7 @@
 import static org.openrewrite.java.Assertions.*;
 import static org.openrewrite.maven.Assertions.pomXml;
 
-class MockitoRuleDependencyTest implements RewriteTest {
+class AddMockitoJupiterForRulesTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec.recipeFromResources("org.openrewrite.java.testing.junit5.UseMockitoExtension")

src/test/java/org/openrewrite/java/testing/mockito/MockitoBestPracticesTest.java

@@ -38,7 +38,7 @@ public void defaults(RecipeSpec spec) {
                   "junit-jupiter-api",
                   "mockito-core",
                   "mockito-junit-jupiter"))
-              .recipeFromResources("org.openrewrite.java.testing.mockito.Mockito1to5Migration");
+              .recipeFromResources("org.openrewrite.java.testing.mockito.MockitoBestPractices");
         }
 
     @DocumentExample

src/test/java/org/openrewrite/java/testing/testcontainers/AddTestcontainersAnnotationsTest.java

@@ -15,6 +15,7 @@
  */
 package org.openrewrite.java.testing.testcontainers;
 
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.InMemoryExecutionContext;
@@ -189,63 +190,6 @@ class MyTest {
         );
     }
 
-    @Test
-    void ignoresNonGenericContainerRule() {
-        rewriteRun(
-          // language=java
-          java(
-            // before
-            """
-              import org.junit.Rule;
-              import org.junit.rules.TemporaryFolder;
-
-              class MyTest {
-                  @Rule
-                  public TemporaryFolder tempFolder = new TemporaryFolder();
-              }
-              """
-          )
-        );
-    }
-
-    @Test
-    void ignoresNonRuleGenericContainer() {
-        rewriteRun(
-          java(
-            // language=java
-            """
-              import org.testcontainers.containers.GenericContainer;
-
-              class MyTest {
-                  public static GenericContainer<?> c_stat = new GenericContainer<>("redis:latest");
-                  public GenericContainer<?> c = new GenericContainer<>("redis:latest");
-              }
-              """
-          )
-        );
-    }
-
-    @Test
-    void isIdempotentForAlreadyMigratedClasses() {
-        rewriteRun(
-          // language=java
-          java(
-            // before
-            """
-              import org.testcontainers.containers.GenericContainer;
-              import org.testcontainers.junit.jupiter.Container;
-              import org.testcontainers.junit.jupiter.Testcontainers;
-
-              @Testcontainers
-              class MyTest {
-                  @Container
-                  public GenericContainer<?> myContainer = new GenericContainer<>("redis:latest");
-              }
-              """
-          )
-        );
-    }
-
     @Test
     void handlesPartiallyMigratedClass() {
         rewriteRun(
@@ -346,4 +290,64 @@ class MyInnerClass {
           )
         );
     }
+
+    @Nested
+    class NoChange {
+        @Test
+        void ignoresNonGenericContainerRule() {
+            rewriteRun(
+              // language=java
+              java(
+                // before
+                """
+                  import org.junit.Rule;
+                  import org.junit.rules.TemporaryFolder;
+
+                  class MyTest {
+                      @Rule
+                      public TemporaryFolder tempFolder = new TemporaryFolder();
+                  }
+                  """
+              )
+            );
+        }
+
+        @Test
+        void ignoresNonRuleGenericContainer() {
+            rewriteRun(
+              java(
+                // language=java
+                """
+                  import org.testcontainers.containers.GenericContainer;
+
+                  class MyTest {
+                      public static GenericContainer<?> c_stat = new GenericContainer<>("redis:latest");
+                      public GenericContainer<?> c = new GenericContainer<>("redis:latest");
+                  }
+                  """
+              )
+            );
+        }
+
+        @Test
+        void isIdempotentForAlreadyMigratedClasses() {
+            rewriteRun(
+              // language=java
+              java(
+                // before
+                """
+                  import org.testcontainers.containers.GenericContainer;
+                  import org.testcontainers.junit.jupiter.Container;
+                  import org.testcontainers.junit.jupiter.Testcontainers;
+
+                  @Testcontainers
+                  class MyTest {
+                      @Container
+                      public GenericContainer<?> myContainer = new GenericContainer<>("redis:latest");
+                  }
+                  """
+              )
+            );
+        }
+    }
 }

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsDeepToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertEqualsDeepToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertEqualsDeepToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsNoOrderToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertEqualsNoOrderToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertEqualsNoOrderToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertEqualsToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertEqualsToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertEqualsToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertListToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertListToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertListToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertNotSameToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertNotSameToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertNotSameToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertSameToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertSameToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertSameToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertThrowsToAssertThatTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertThrowsToAssertThatTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertThrowsToAssertThat());
     }
 

src/test/java/org/openrewrite/java/testing/testng/TestNgAssertionToAssertJTest.java

@@ -17,6 +17,7 @@
 
 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;
@@ -27,7 +28,7 @@ class TestNgAssertionToAssertJTest implements RewriteTest {
     @Override
     public void defaults(RecipeSpec spec) {
         spec
-          .parser(JavaParser.fromJavaVersion().classpath("testng"))
+          .parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "testng-7"))
           .recipe(new TestNgAssertionToAssertJ());
     }