Fix erroneous addition of useJUnitPlatform() call to sourceSet's test…

… dsl
openrewrite · Mar 20, 2024 · 74ce09f · 74ce09f
1 parent 02c06d0
commit 74ce09f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java b/src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java
@@ -176,6 +176,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     if (!(m.getArguments().size() == 1 && m.getArguments().get(0) instanceof J.Lambda)) {
                         return m;
                     }
+                    // Other DSLs may be named "test" so only assume it is test {} if it isn't enclosed in anything else
+                    if(getCursor().getParentTreeCursor().firstEnclosing(J.MethodInvocation.class) != null) {
+                        return m;
+                    }
                     break;
                 case "named":
                     if (m.getArguments().isEmpty()) {

diff --git a/src/test/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiterTest.java b/src/test/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiterTest.java
@@ -202,4 +202,40 @@ void tasksNamedTestNoType() {
           )
         );
     }
+
+    @Test
+    void leaveOtherTestDslAlone() {
+        rewriteRun(
+          //language=groovy
+          buildGradle(
+            """
+              plugins {
+                  id 'java'
+              }
+              sourceSets {
+                  test {
+                      java {
+                          srcDir 'src/test/java'
+                      }
+                  }
+              }
+              """,
+            """
+              plugins {
+                  id 'java'
+              }
+              sourceSets {
+                  test {
+                      java {
+                          srcDir 'src/test/java'
+                      }
+                  }
+              }
+              tasks.withType(Test).configureEach {
+                  useJUnitPlatform()
+              }
+              """
+          )
+        );
+    }
 }