Also remove exclusion from spring-boot-testcontainers

Fixes #477
openrewrite · Feb 7, 2024 · 5551893 · 5551893
1 parent d93fd26
commit 5551893
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 4 deletions.
diff --git a/src/main/resources/META-INF/rewrite/junit5.yml b/src/main/resources/META-INF/rewrite/junit5.yml
@@ -101,6 +101,12 @@ recipeList:
       artifactId: testcontainers
       exclusionGroupId: junit
       exclusionArtifactId: junit
+  # Similar for https://github.com/openrewrite/rewrite-testing-frameworks/issues/477
+  - org.openrewrite.maven.RemoveExclusion:
+      groupId: org.springframework.boot
+      artifactId: spring-boot-testcontainers
+      exclusionGroupId: junit
+      exclusionArtifactId: junit
   - org.openrewrite.java.dependencies.RemoveDependency:
       groupId: org.junit.vintage
       artifactId: junit-vintage-engine

diff --git a/src/test/java/org/openrewrite/java/testing/junit5/JUnit5MigrationTest.java b/src/test/java/org/openrewrite/java/testing/junit5/JUnit5MigrationTest.java
@@ -186,6 +186,49 @@ void dontExcludeJunit4DependencyfromTestcontainers() {
         rewriteRun(pomXml(before, before));
     }
 
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/477")
+    void dontExcludeJunit4DependencyfromSpringBootTestcontainers() {
+        //language=xml
+        String before = """
+          <project>
+              <modelVersion>4.0.0</modelVersion>
+              <parent>
+                  <groupId>org.springframework.boot</groupId>
+                  <artifactId>spring-boot-starter-parent</artifactId>
+                  <version>3.2.1</version>
+                  <relativePath/> <!-- lookup parent from repository -->
+              </parent>
+              <groupId>dev.ted</groupId>
+              <artifactId>testcontainer-migrate</artifactId>
+              <version>0.0.1</version>
+              <dependencies>
+                  <dependency>
+                      <groupId>org.springframework.boot</groupId>
+                      <artifactId>spring-boot-starter</artifactId>
+                  </dependency>
+                  <dependency>
+                      <groupId>org.springframework.boot</groupId>
+                      <artifactId>spring-boot-starter-test</artifactId>
+                      <scope>test</scope>
+                  </dependency>
+                  <dependency>
+                      <groupId>org.springframework.boot</groupId>
+                      <artifactId>spring-boot-testcontainers</artifactId>
+                      <scope>test</scope>
+                  </dependency>
+                  <dependency>
+                      <groupId>org.testcontainers</groupId>
+                      <artifactId>junit-jupiter</artifactId>
+                      <scope>test</scope>
+                  </dependency>
+              </dependencies>
+          </project>
+          """;
+        // Output identical, but we want to make sure we don't exclude junit4 from testcontainers
+        rewriteRun(pomXml(before, before));
+    }
+
     // edge case for deprecated use of assertEquals
     // https://junit.org/junit4/javadoc/4.13/org/junit/Assert.html#assertEquals(java.lang.Object%5B%5D,%20java.lang.Object%5B%5D)
     @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/pull/384")
@@ -226,7 +269,7 @@ void migrateInheritedTestBeforeAfterAnnotations() {
               import org.junit.After;
               import org.junit.Before;
               import org.junit.Test;
-              
+                            
               public class AbstractTest {
                   @Before
                   public void before() {
@@ -241,11 +284,11 @@ public void test() {
                   }
               }
               """,
-              """
+            """
               import org.junit.jupiter.api.AfterEach;
               import org.junit.jupiter.api.BeforeEach;
               import org.junit.jupiter.api.Test;
-              
+                            
               public class AbstractTest {
                   @BeforeEach
                   public void before() {
@@ -278,7 +321,7 @@ public void test() {
               import org.junit.jupiter.api.AfterEach;
               import org.junit.jupiter.api.BeforeEach;
               import org.junit.jupiter.api.Test;
-              
+                            
               public class A extends AbstractTest {
                   @BeforeEach
                   public void before() {