Composed existing JUnit5 assertion cleanup recipes into a well-ordere… (#232)

* Composed existing JUnit5 assertion cleanup recipes into a well-ordered parent recipe, and adjusted JUnit5BestPractices to use that new recipe instead of a small subset

* Avoiding ClassCastException in assertion cleanup recipes

Author: nmck257

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

@@ -104,11 +104,14 @@ private boolean isEqualBinary(J.MethodInvocation method) {
                     return false;
                 }
 
-                J.Binary binary = (J.Binary) method.getArguments().get(0);
+                final Expression firstArgument = method.getArguments().get(0);
+                if (!(firstArgument instanceof J.Binary)) {
+                    return false;
+                }
+
+                J.Binary binary = (J.Binary) firstArgument;
                 J.Binary.Type operator = binary.getOperator();
                 return operator.equals(J.Binary.Type.Equal);
-
-
             }
         };
     }

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

@@ -96,11 +96,14 @@ private boolean isEqualBinary(J.MethodInvocation method) {
                     return false;
                 }
 
-                J.Binary binary = (J.Binary) method.getArguments().get(0);
+                final Expression firstArgument = method.getArguments().get(0);
+                if (!(firstArgument instanceof J.Binary)) {
+                    return false;
+                }
+
+                J.Binary binary = (J.Binary) firstArgument;
                 J.Binary.Type operator = binary.getOperator();
                 return operator.equals(J.Binary.Type.Equal);
-
-
             }
         };
     }

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

@@ -104,11 +104,14 @@ private boolean isEqualBinary(J.MethodInvocation method) {
                     return false;
                 }
 
-                J.Binary binary = (J.Binary) method.getArguments().get(0);
+                final Expression firstArgument = method.getArguments().get(0);
+                if (!(firstArgument instanceof J.Binary)) {
+                    return false;
+                }
+
+                J.Binary binary = (J.Binary) firstArgument;
                 J.Binary.Type operator = binary.getOperator();
                 return operator.equals(J.Binary.Type.Equal);
-
-
             }
         };
     }

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

@@ -24,9 +24,7 @@ tags:
 recipeList:
   - org.openrewrite.java.testing.junit5.StaticImports
   - org.openrewrite.java.testing.junit5.JUnit4to5Migration
-  - org.openrewrite.java.testing.cleanup.AssertEqualsNullToAssertNull
-  - org.openrewrite.java.testing.cleanup.AssertFalseEqualsToAssertNotEquals
-  - org.openrewrite.java.testing.cleanup.AssertTrueEqualsToAssertEquals
+  - org.openrewrite.java.testing.junit5.CleanupAssertions
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.junit5.StaticImports
@@ -174,4 +172,19 @@ recipeList:
       artifactId: vertx-junit5
       version: 4.x
       onlyIfUsing: io.vertx.junit5.VertxExtension
-
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.testing.junit5.CleanupAssertions
+displayName: Clean Up Assertions
+description: Simplifies JUnit Jupiter assertions to their most-direct equivalents
+tags:
+  - testing
+  - junit
+recipeList:
+  - org.openrewrite.java.testing.cleanup.AssertTrueNegationToAssertFalse
+  - org.openrewrite.java.testing.cleanup.AssertFalseNegationToAssertTrue
+  - org.openrewrite.java.testing.cleanup.AssertTrueEqualsToAssertEquals
+  - org.openrewrite.java.testing.cleanup.AssertTrueComparisonToAssertEquals
+  - org.openrewrite.java.testing.cleanup.AssertFalseEqualsToAssertNotEquals
+  - org.openrewrite.java.testing.cleanup.AssertEqualsNullToAssertNull
+  - org.openrewrite.java.testing.cleanup.AssertFalseNullToAssertNotNull

src/test/kotlin/org/openrewrite/java/testing/junit5/CleanupAssertionsTest.kt

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2021 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.testing.junit5
+
+import org.junit.jupiter.api.Test
+import org.openrewrite.config.Environment
+import org.openrewrite.java.JavaParser
+import org.openrewrite.test.RecipeSpec
+import org.openrewrite.test.RewriteTest
+
+class CleanupAssertionsTest : RewriteTest {
+    override fun defaults(spec: RecipeSpec) {
+        spec.recipe(Environment.builder()
+                .scanRuntimeClasspath("org.openrewrite.java.testing.junit5")
+                .build()
+                .activateRecipes("org.openrewrite.java.testing.junit5.CleanupAssertions"))
+            .parser(JavaParser.fromJavaVersion()
+                .classpath("junit-jupiter-api")
+                .build())
+    }
+
+    @Test
+    fun assertTrueComparisonNullToAssertNull() = rewriteRun(java(
+        """
+            import org.junit.jupiter.api.Assertions;
+            import org.junit.jupiter.api.Test;
+
+            class ExampleTest {
+                @Test
+                void test() {
+                    Assertions.assertTrue("" == null);
+                }
+            }
+        """, """
+            import org.junit.jupiter.api.Assertions;
+            import org.junit.jupiter.api.Test;
+
+            class ExampleTest {
+                @Test
+                void test() {
+                    Assertions.assertNull("");
+                }
+            }
+        """
+    ))
+
+    @Test
+    fun assertFalseNegatedEqualsToAssertEquals() = rewriteRun(java(
+        """
+            import org.junit.jupiter.api.Assertions;
+            import org.junit.jupiter.api.Test;
+
+            class ExampleTest {
+                @Test
+                void test() {
+                    Assertions.assertFalse(!"".equals(""));
+                }
+            }
+        """, """
+            import org.junit.jupiter.api.Assertions;
+            import org.junit.jupiter.api.Test;
+
+            class ExampleTest {
+                @Test
+                void test() {
+                    Assertions.assertEquals("", "");
+                }
+            }
+        """
+    ))
+
+    @Test
+    fun assertFalseNegatedEqualsNullToAssertNull() = rewriteRun(java(
+        """
+            import org.junit.jupiter.api.Assertions;
+            import org.junit.jupiter.api.Test;
+
+            class ExampleTest {
+                @Test
+                void test() {
+                    Assertions.assertFalse(!"".equals(null));
+                }
+            }
+        """, """
+            import org.junit.jupiter.api.Assertions;
+            import org.junit.jupiter.api.Test;
+
+            class ExampleTest {
+                @Test
+                void test() {
+                    Assertions.assertNull("");
+                }
+            }
+        """
+    ))
+}