Upgrade testcontainers for the JUnit 5 migration (#833)

* Upgrade testcontainers for the JUnit 5 migration

* Upgrade before exclude

* Reformat

Author: timtebeek

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

@@ -130,13 +130,14 @@ recipeList:
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.junit5.ExcludeJUnit4UnlessUsingTestcontainers
-displayName: Exclude JUnit 4, unless Testcontainers is used
-description: Excludes JUnit 4, as it ought not to be necessary in a JUnit 5 project, unless Testcontainers is used.
+displayName: Exclude JUnit 4, unless Spring Boot Testcontainers is used
+description: Excludes JUnit 4, as it ought not to be necessary in a JUnit 5 project, unless Testcontainers 1.x is used.
 preconditions:
   - org.openrewrite.maven.search.DoesNotIncludeDependency:
-      groupId: org.testcontainers
-      artifactId: '*'
+      groupId: org.springframework.boot
+      artifactId: spring-boot-testcontainers
 recipeList:
+  - org.openrewrite.java.testing.testcontainers.Testcontainers2Migration
   - org.openrewrite.maven.ExcludeDependency:
       groupId: junit
       artifactId: junit

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

@@ -21,11 +21,19 @@ displayName: Testcontainers best practices
 description: Apply best practices to Testcontainers usage.
 recipeList:
   - org.openrewrite.java.testing.testcontainers.Testcontainers2Migration
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.testing.testcontainers.Testcontainers2Migration
+displayName: Migrate to testcontainers-java 2.x
+description: Change dependencies and types to migrate to testcontainers-java 2.x.
+recipeList:
   - org.openrewrite.java.testing.testcontainers.ExplicitContainerImages
   - org.openrewrite.java.testing.testcontainers.GetHostMigration
   - org.openrewrite.java.ChangeType:
       oldFullyQualifiedTypeName: org.testcontainers.containers.DockerComposeContainer
       newFullyQualifiedTypeName: org.testcontainers.containers.ComposeContainer
+  - org.openrewrite.java.testing.testcontainers.Testcontainers2Dependencies
+  - org.openrewrite.java.testing.testcontainers.Testcontainers2ContainerClasses
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.testcontainers.GetHostMigration
@@ -123,14 +131,6 @@ recipeList:
       parseImage: true
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.java.testing.testcontainers.Testcontainers2Migration
-displayName: Migrate to testcontainers-java 2.x
-description: Change dependencies and types to migrate to testcontainers-java 2.x.
-recipeList:
-  - org.openrewrite.java.testing.testcontainers.Testcontainers2Dependencies
-  - org.openrewrite.java.testing.testcontainers.Testcontainers2ContainerClasses
----
-type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.testcontainers.Testcontainers2Dependencies
 displayName: Rename Testcontainers dependencies
 description: Change Testcontainers dependencies to adopt the new consistent `testcontainers-` prefix.

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

@@ -249,6 +249,22 @@ void dontExcludeJunit4DependencyFromTestcontainers() {
                       </dependency>
                   </dependencies>
               </project>
+              """,
+            """
+              <project>
+                  <modelVersion>4.0.0</modelVersion>
+                  <groupId>com.example.jackson</groupId>
+                  <artifactId>test-plugins</artifactId>
+                  <version>1.0.0</version>
+                  <dependencies>
+                      <dependency>
+                          <groupId>org.testcontainers</groupId>
+                          <artifactId>testcontainers</artifactId>
+                          <version>2.0.1</version>
+                          <scope>test</scope>
+                      </dependency>
+                  </dependencies>
+              </project>
               """
           )
         );
@@ -275,6 +291,22 @@ void dontExcludeJunit4DependencyFromTestcontainersJupiter() {
                       </dependency>
                   </dependencies>
               </project>
+              """,
+            """
+              <project>
+                  <modelVersion>4.0.0</modelVersion>
+                  <groupId>com.example.jackson</groupId>
+                  <artifactId>test-plugins</artifactId>
+                  <version>1.0.0</version>
+                  <dependencies>
+                      <dependency>
+                          <groupId>org.testcontainers</groupId>
+                          <artifactId>testcontainers-junit-jupiter</artifactId>
+                          <version>2.0.1</version>
+                          <scope>test</scope>
+                      </dependency>
+                  </dependencies>
+              </project>
               """
           )
         );
@@ -512,7 +544,9 @@ void removeJunitVintageEngineFromGradleBuild() {
               }
               """
           ),
-          srcTestJava(java("""
+          srcTestJava(
+            java(
+              """
                 import org.junit.Test;
 
                 public class MyTest {
@@ -521,7 +555,7 @@ public void hello() {
                     }
                 }
                 """,
-                """
+              """
                 import org.junit.jupiter.api.Test;
 
                 public class MyTest {
@@ -530,7 +564,8 @@ public void hello() {
                     }
                 }
                 """
-            ))
+            )
+          )
         );
     }