Fix ParameterizedRunnerToParameterized: Remove redundant super call (#718)

* Fix ParameterizedRunnerToParameterized: Remove redundant super call

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix bot changes

* Remove one additional super call no longer allowed

* Trim how we remove super call

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim te Beek <[email protected]>

Author: 3 people

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

@@ -76,7 +76,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
 
                 // Constructor Injected Test
                 if (parametersMethodName != null && constructorParams != null && constructorParams.stream().anyMatch(org.openrewrite.java.tree.J.VariableDeclarations.class::isInstance)) {
-                    doAfterVisit(new ParameterizedRunnerToParameterizedTestsVisitor(classDecl, parametersMethodName, initMethodName, parametersAnnotationArguments, constructorParams, true, beforeMethodName,ctx));
+                    doAfterVisit(new ParameterizedRunnerToParameterizedTestsVisitor(classDecl, parametersMethodName, initMethodName, parametersAnnotationArguments, constructorParams, true, beforeMethodName, ctx));
                 }
 
                 // Field Injected Test
@@ -266,7 +266,6 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                 return cd;
             }
 
-
             if (initMethodDeclarationTemplate != null) {
                 cd = initMethodDeclarationTemplate.apply(updateCursor(cd), cd.getBody().getCoordinates().lastStatement());
                 J.Block finalBody = cd.getBody();
@@ -291,7 +290,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                     if (statement instanceof J.VariableDeclarations) {
                         J.VariableDeclarations varDecls = (J.VariableDeclarations) statement;
                         if (varDecls.getVariables().stream().anyMatch(it -> fieldNames.contains(it.getSimpleName())) &&
-                            (varDecls.hasModifier(J.Modifier.Type.Final))) {
+                                (varDecls.hasModifier(J.Modifier.Type.Final))) {
                             varDecls = varDecls.withModifiers(ListUtils.map(varDecls.getModifiers(), mod -> mod.getType() == J.Modifier.Type.Final ? null : mod));
                             statement = maybeAutoFormat(statement, varDecls, ctx, new Cursor(getCursor(), finalBody));
                         }
@@ -382,6 +381,12 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                             })
                             .collect(Collectors.toSet());
                     getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance).putMessage("INIT_VARS", fieldNames);
+
+                    // Remove any potential super call
+                    m = m.withBody(m.getBody().withStatements(ListUtils.mapFirst(m.getBody().getStatements(),
+                            stmt -> stmt instanceof J.MethodInvocation &&
+                                    "super".equals(((J.MethodInvocation) stmt).getSimpleName()) ?
+                                    null : stmt)));
                 }
             }
             return m;

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

@@ -497,7 +497,6 @@ public static Collection<Object[]> data1() {
                       }
 
                       public void initI1(String path) {
-                          super(path);
                       }
 
                       @MethodSource("data1")
@@ -590,4 +589,89 @@ public void initSampleTestClass(int num1, int num2, int num3) {
               """
           ));
     }
+
+    @Test
+    void methodSourceWithSuperCall() {
+        //language=java
+        rewriteRun(
+          spec -> spec.typeValidationOptions(TypeValidation.none()),
+          java(
+            """
+              import org.junit.Test;
+              import org.junit.runner.RunWith;
+              import org.junit.runners.Parameterized;
+              import org.junit.runners.Parameterized.Parameters;
+
+              import java.util.Arrays;
+              import java.util.List;
+
+              @RunWith(Parameterized.class)
+              public class VetTests {
+
+                  private String firstName;
+                  private String lastName;
+                  private Integer id;
+
+                  public VetTests(String firstName, String lastName, Integer id) {
+                      super();
+                      this.firstName = firstName;
+                      this.lastName = lastName;
+                      this.id = id;
+                  }
+
+                  @Test
+                  public void testSerialization() {
+                      Vet vet = new Vet();
+                      vet.setFirstName(firstName);
+                      vet.setLastName(lastName);
+                      vet.setId(id);
+                  }
+
+                  @Parameters
+                  public static List<Object[]> parameters() {
+                      return Arrays.asList(
+                          new Object[] { "Otis", "TheDog", 124 },
+                          new Object[] { "Garfield", "TheBoss", 126 });
+                  }
+              }
+              """,
+            """
+              import org.junit.jupiter.params.ParameterizedTest;
+              import org.junit.jupiter.params.provider.MethodSource;
+
+              import java.util.Arrays;
+              import java.util.List;
+
+              public class VetTests {
+
+                  private String firstName;
+                  private String lastName;
+                  private Integer id;
+
+                  public void initVetTests(String firstName, String lastName, Integer id) {
+                      this.firstName = firstName;
+                      this.lastName = lastName;
+                      this.id = id;
+                  }
+
+                  @MethodSource("parameters")
+                  @ParameterizedTest
+                  public void testSerialization(String firstName, String lastName, Integer id) {
+                      initVetTests(firstName, lastName, id);
+                      Vet vet = new Vet();
+                      vet.setFirstName(firstName);
+                      vet.setLastName(lastName);
+                      vet.setId(id);
+                  }
+
+                  public static List<Object[]> parameters() {
+                      return Arrays.asList(
+                          new Object[] { "Otis", "TheDog", 124 },
+                          new Object[] { "Garfield", "TheBoss", 126 });
+                  }
+              }
+              """
+          )
+        );
+    }
 }