Call super.visitMethodInvocation first, as is customary unless explic…

…itly needed in a different order
openrewrite · Nov 5, 2024 · 6452e0f · 6452e0f
1 parent e31cd2d
commit 6452e0f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java
@@ -48,13 +48,13 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
 
                     @Override
                     public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-                        List<Expression> args = method.getArguments();
+                        J.MethodInvocation md = super.visitMethodInvocation(method, ctx);
 
+                        List<Expression> args = md.getArguments();
                         if (args.size() < 2 || args.size() > 3) {
-                            return super.visitMethodInvocation(method, ctx);
+                            return md;
                         }
 
-                        J.MethodInvocation md;
                         Expression expectedType = args.get(0);
                         Expression actualValue = args.get(1);
 
@@ -74,7 +74,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                         maybeAddImport("org.assertj.core.api.Assertions", "assertThat", false);
                         maybeRemoveImport("org.junit.jupiter.api.Assertions");
 
-                        return super.visitMethodInvocation(md, ctx);
+                        return md;
                     }
 
                     private J.MethodInvocation rewriteAssertToInstance(JavaTemplate.Builder template, J.MethodInvocation method, ExecutionContext ctx, Object... parameters) {

diff --git a/...test/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThatTest.java b/...test/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThatTest.java
@@ -201,4 +201,32 @@ void test() {
         );
     }
 
+    @Test
+    void doesConvertNestedMethodInvocations() {
+        rewriteRun(
+          // language=java
+          java(
+            """
+              import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+              import static org.junit.jupiter.api.Assertions.assertAll;
+
+              class Test {
+                  void test() {
+                      assertAll(() -> assertInstanceOf(Integer.class, 4));
+                  }
+              }
+              """,
+            """
+              import static org.assertj.core.api.Assertions.assertThat;
+              import static org.junit.jupiter.api.Assertions.assertAll;
+
+              class Test {
+                  void test() {
+                      assertAll(() -> assertThat(4).isInstanceOf(Integer.class));
+                  }
+              }
+              """
+          )
+        );
+    }
 }