improve recipe and add test (#449)

Co-authored-by: Thomas Mauch <[email protected]> Co-authored-by: Tim te Beek <[email protected]>
openrewrite · Jan 4, 2024 · 326c048 · 326c048
1 parent dc61c73
commit 326c048
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 3 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AddMissingTestBeforeAfterAnnotations.java b/src/main/java/org/openrewrite/java/testing/junit5/AddMissingTestBeforeAfterAnnotations.java
@@ -66,11 +66,14 @@ private static class AddMissingTestBeforeAfterAnnotationsVisitor extends JavaIso
         @Override
         public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
             if (!method.hasModifier(J.Modifier.Type.Static) && !method.isConstructor()) {
-                Optional<Method> superMethod = TypeUtils.findOverriddenMethod(method.getMethodType());
-                if (superMethod.isPresent()) {
+                Method currMethod = method.getMethodType();
+                Optional<Method> superMethod = TypeUtils.findOverriddenMethod(currMethod);
+                while (superMethod.isPresent()) {
                     method = maybeAddMissingAnnotation(method, superMethod.get(), LifecyleAnnotation.BEFORE_EACH, ctx);
                     method = maybeAddMissingAnnotation(method, superMethod.get(), LifecyleAnnotation.AFTER_EACH, ctx);
                     method = maybeAddMissingAnnotation(method, superMethod.get(), LifecyleAnnotation.TEST, ctx);
+                    currMethod = superMethod.get();
+                    superMethod = TypeUtils.findOverriddenMethod(currMethod);
                 }
             }
             return super.visitMethodDeclaration(method, ctx);

diff --git a/...st/java/org/openrewrite/java/testing/junit5/AddMissingTestBeforeAfterAnnotationsTest.java b/...st/java/org/openrewrite/java/testing/junit5/AddMissingTestBeforeAfterAnnotationsTest.java
@@ -92,7 +92,7 @@ public void test() {
           )
         );
     }
-    
+
     @Test
     void addMissingTestBeforeAfterAnnotationsIfNewFound() {
         //language=java
@@ -154,4 +154,98 @@ public void test() {
         );
     }
 
+    @Test
+    void addMissingTestBeforeAfterAnnotationsIfExtended() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              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() {
+                  }
+
+                  @AfterEach
+                  public void after() {
+                  }
+
+                  @Test
+                  public void test() {
+                  }
+              }
+              """
+          ),
+          java(
+            """
+              public class A extends AbstractTest {
+                  public void before() {
+                  }
+
+                  public void after() {
+                  }
+
+                  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() {
+                  }
+
+                  @AfterEach
+                  public void after() {
+                  }
+
+                  @Test
+                  public void test() {
+                  }
+              }
+              """
+          ),
+          java(
+                """
+                  public class B extends A {
+                      public void before() {
+                      }
+
+                      public void after() {
+                      }
+
+                      public void test() {
+                      }
+                  }
+                  """,
+                """
+                  import org.junit.jupiter.api.AfterEach;
+                  import org.junit.jupiter.api.BeforeEach;
+                  import org.junit.jupiter.api.Test;
+                  
+                  public class B extends A {
+                      @BeforeEach
+                      public void before() {
+                      }
+
+                      @AfterEach
+                      public void after() {
+                      }
+
+                      @Test
+                      public void test() {
+                      }
+                  }
+                  """
+              )
+            );
+    }
+
 }