OpenRewrite recipe best practices

Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.recipes.rewrite.OpenRewriteRecipeBestPractices?organizationId=QUxML01vZGVybmUvTW9kZXJuZSArIE9wZW5SZXdyaXRl

Co-authored-by: Moderne <team@moderne.io>

Author: timtebeek

src/main/java/org/openrewrite/java/testing/cleanup/TestMethodsShouldBeVoid.java

@@ -73,7 +73,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                 }
 
                 // Remove return statements that are not in nested classes or lambdas
-                return m.withBody((J.Block) new RemoveDirectReturns().visitBlock(requireNonNull(m.getBody()), ctx));
+                return m.withBody((J.Block) new RemoveDirectReturns().visit(requireNonNull(m.getBody()), ctx, getCursor().getParentTreeCursor()));
             }
         });
     }

src/main/java/org/openrewrite/java/testing/mockito/RemoveInitMocksIfRunnersSpecified.java

@@ -143,10 +143,10 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                             @Override
                             public J.@Nullable If visitIf(J.If iff, ExecutionContext ctx) {
                                 J.If i = super.visitIf(iff, ctx);
-                                if (i != iff
-                                    && i.getThenPart() instanceof J.Block
-                                    && ((J.Block) i.getThenPart()).getStatements().isEmpty()
-                                    && i.getElsePart() == null) {
+                                if (i != iff &&
+                                    i.getThenPart() instanceof J.Block &&
+                                    ((J.Block) i.getThenPart()).getStatements().isEmpty() &&
+                                    i.getElsePart() == null) {
                                     return null;
                                 }
                                 return i;

src/main/java/org/openrewrite/java/testing/mockito/ThenThrowCheckedExceptionToRuntimeException.java

@@ -20,6 +20,7 @@
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.ListUtils;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesType;
@@ -28,8 +29,6 @@
 import org.openrewrite.java.tree.JavaType;
 import org.openrewrite.java.tree.TypeUtils;
 
-import org.openrewrite.internal.ListUtils;
-
 
 public class ThenThrowCheckedExceptionToRuntimeException extends Recipe {
     @Getter

src/main/resources/META-INF/rewrite/examples.yml

@@ -1203,6 +1203,29 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
+recipeName: org.openrewrite.java.testing.cleanup.AssertEqualsIntegralDeltaToAssertEquals
+examples:
+- description: '`AssertEqualsIntegralDeltaToAssertEqualsTest#removeIntDelta`'
+  sources:
+  - before: |
+      import static org.junit.jupiter.api.Assertions.assertEquals;
+
+      public class Test {
+          void test() {
+              assertEquals(1, 2, 0);
+          }
+      }
+    after: |
+      import static org.junit.jupiter.api.Assertions.assertEquals;
+
+      public class Test {
+          void test() {
+              assertEquals(1, 2);
+          }
+      }
+    language: java
+---
+type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.cleanup.AssertLiteralBooleanRemovedRecipe
 examples:
 - description: '`AssertLiteralBooleanRemovedTest#assertWithStaticImports`'
@@ -4722,6 +4745,43 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
+recipeName: org.openrewrite.java.testing.mockito.PowerMockitoDoStubbingToMockito
+examples:
+- description: '`PowerMockitoDoStubbingToMockitoTest#doNothingWithStringMethodName`'
+  sources:
+  - before: |
+      import org.junit.jupiter.api.BeforeEach;
+      import org.powermock.api.mockito.PowerMockito;
+      import java.util.Calendar;
+
+      class MyTest {
+
+          private Calendar calendarSpy;
+
+          @BeforeEach
+          void setUp() throws Exception {
+              calendarSpy = PowerMockito.spy(Calendar.getInstance());
+              PowerMockito.doNothing().when(calendarSpy, "clear");
+          }
+      }
+    after: |
+      import org.junit.jupiter.api.BeforeEach;
+      import org.powermock.api.mockito.PowerMockito;
+      import java.util.Calendar;
+
+      class MyTest {
+
+          private Calendar calendarSpy;
+
+          @BeforeEach
+          void setUp() throws Exception {
+              calendarSpy = PowerMockito.spy(Calendar.getInstance());
+              PowerMockito.doNothing().when(calendarSpy).clear();
+          }
+      }
+    language: java
+---
+type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.mockito.PowerMockitoMockStaticToMockito
 examples:
 - description: '`PowerMockitoMockStaticToMockitoTest#prepareForTestAnnotationIsReplacedBySingleField`'
@@ -4773,6 +4833,53 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
+recipeName: org.openrewrite.java.testing.mockito.RemoveDoNothingForDefaultMocks
+examples:
+- description: '`RemoveDoNothingForDefaultMocksTest#removesDoNothingOnMockVoidMethod`'
+  sources:
+  - before: |
+      import org.junit.Test;
+      import org.junit.runner.RunWith;
+      import org.mockito.Mock;
+      import org.mockito.junit.MockitoJUnitRunner;
+      import java.io.BufferedWriter;
+      import java.io.IOException;
+
+      import static org.mockito.Mockito.doNothing;
+      import static org.mockito.ArgumentMatchers.anyString;
+
+      @RunWith(MockitoJUnitRunner.class)
+      class MyTest {
+          @Mock
+          private BufferedWriter bufferedWriter;
+
+          @Test
+          public void test() throws IOException {
+              doNothing().when(bufferedWriter).write(anyString());
+          }
+      }
+    after: |
+      import org.junit.Test;
+      import org.junit.runner.RunWith;
+      import org.mockito.Mock;
+      import org.mockito.junit.MockitoJUnitRunner;
+      import java.io.BufferedWriter;
+      import java.io.IOException;
+
+      import static org.mockito.ArgumentMatchers.anyString;
+
+      @RunWith(MockitoJUnitRunner.class)
+      class MyTest {
+          @Mock
+          private BufferedWriter bufferedWriter;
+
+          @Test
+          public void test() throws IOException {
+          }
+      }
+    language: java
+---
+type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.mockito.RemoveInitMocksIfRunnersSpecified
 examples:
 - description: '`RemoveInitMocksIfRunnersSpecifiedTest#removeInitMocksInJUnit5`'
@@ -4807,6 +4914,24 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
+recipeName: org.openrewrite.java.testing.mockito.RemovePowerMockClassExtensions
+examples:
+- description: '`RemovePowerMockClassExtensionsTest#extensionOfPowerMockTestCaseGetsRemoved`'
+  sources:
+  - before: |
+      import org.powermock.modules.testng.PowerMockTestCase;
+
+      public class MyPowerMockTestCase extends PowerMockTestCase {}
+    after: |
+      public class MyPowerMockTestCase {}
+    language: java
+  - before: |
+      package org.powermock.modules.testng;
+
+      public class PowerMockTestCase {}
+    language: java
+---
+type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.mockito.RemoveTimesZeroAndOne
 examples:
 - description: '`RemoveTimesZeroAndOneTest#replaceTimesZero`'
@@ -5029,6 +5154,29 @@ examples:
     language: java
 ---
 type: specs.openrewrite.org/v1beta/example
+recipeName: org.openrewrite.java.testing.mockito.ThenThrowCheckedExceptionToRuntimeException
+examples:
+- description: '`ThenThrowCheckedExceptionToRuntimeExceptionTest#replacesUndeclaredCheckedExceptionWithRuntimeException`'
+  sources:
+  - before: |
+      import static org.mockito.Mockito.when;
+
+      class MyTest {
+          void test(MyService service) {
+              when(service.execute("a", "b")).thenThrow(Exception.class);
+          }
+      }
+    after: |
+      import static org.mockito.Mockito.when;
+
+      class MyTest {
+          void test(MyService service) {
+              when(service.execute("a", "b")).thenThrow(RuntimeException.class);
+          }
+      }
+    language: java
+---
+type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.mockito.VerifyZeroToNoMoreInteractions
 examples:
 - description: '`VerifyZeroToNoMoreInteractionsTest#shouldReplaceToNoMoreInteractions`'

src/test/java/org/openrewrite/java/testing/testcontainers/TestcontainersBestPracticesTest.java

@@ -26,7 +26,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.java.Assertions.java;
 import static org.openrewrite.maven.Assertions.pomXml;
 
@@ -138,7 +138,7 @@ void dependencyUpdate() {
                   """,
                 spec -> spec.after(after -> {
                     Matcher matcher = Pattern.compile("<version>(2\\.\\d+\\.\\d+)</version>").matcher(after);
-                    assertTrue(matcher.find());
+                    assertThat(matcher.find()).isTrue();
                     String afterVersion = matcher.group(1);
                     //language=xml
                     return """