Do not ChangeMethodTargetToStatic for AssertJ's AssertionsFor...Types (#693)

Fixes #664

Author: timtebeek

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

@@ -60,12 +60,13 @@ tags:
   - testing
   - assertj
 recipeList:
-  - org.openrewrite.java.ChangeMethodTargetToStatic:
-      methodPattern: "org.assertj.core.api.AssertionsForClassTypes assertThat(..)"
-      fullyQualifiedTargetTypeName: "org.assertj.core.api.Assertions"
-  - org.openrewrite.java.ChangeMethodTargetToStatic:
-      methodPattern: "org.assertj.core.api.AssertionsForInterfaceTypes assertThat(..)"
-      fullyQualifiedTargetTypeName: "org.assertj.core.api.Assertions"
+# https://github.com/openrewrite/rewrite-testing-frameworks/issues/664
+#  - org.openrewrite.java.ChangeMethodTargetToStatic:
+#      methodPattern: "org.assertj.core.api.AssertionsForClassTypes assertThat(..)"
+#      fullyQualifiedTargetTypeName: "org.assertj.core.api.Assertions"
+#  - org.openrewrite.java.ChangeMethodTargetToStatic:
+#      methodPattern: "org.assertj.core.api.AssertionsForInterfaceTypes assertThat(..)"
+#      fullyQualifiedTargetTypeName: "org.assertj.core.api.Assertions"
   - org.openrewrite.java.ChangeMethodTargetToStatic:
       methodPattern: "org.assertj.core.api.Fail fail(..)"
       fullyQualifiedTargetTypeName: "org.assertj.core.api.Assertions"

src/test/java/org/openrewrite/java/testing/assertj/StaticImportsTest.java

@@ -16,9 +16,11 @@
 package org.openrewrite.java.testing.assertj;
 
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Issue;
 import org.openrewrite.config.Environment;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
@@ -41,7 +43,47 @@ public void defaults(RecipeSpec spec) {
 
     @DocumentExample
     @Test
-    void useAssertionsStaticImport() {
+    void useStaticImports() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import java.util.List;
+              import org.assertj.core.api.Assertions;
+              import static org.assertj.core.api.Fail.fail;
+
+              public class Test {
+                  List<String> exampleList;
+                  void method() {
+                      Assertions.assertThat(true).isTrue();
+                      Assertions.assertThat(exampleList).hasSize(0);
+                      fail("This is a failure");
+                  }
+              }
+              """,
+            """
+              import java.util.List;
+
+              import static org.assertj.core.api.Assertions.assertThat;
+              import static org.assertj.core.api.Assertions.fail;
+
+              public class Test {
+                  List<String> exampleList;
+                  void method() {
+                      assertThat(true).isTrue();
+                      assertThat(exampleList).hasSize(0);
+                      fail("This is a failure");
+                  }
+              }
+              """
+          )
+        );
+    }
+
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/664")
+    @Test
+    @Disabled("Requires changes in AssertJ to adopt `assertThatClass` and `assertThatInterface`")
+    void assertionsForClassTypes() {
         //language=java
         rewriteRun(
           java(
@@ -51,7 +93,6 @@ void useAssertionsStaticImport() {
               import org.assertj.core.api.AssertionsForInterfaceTypes;
               import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
               import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-              import static org.assertj.core.api.Fail.fail;
 
               public class Test {
                   List<String> exampleList;
@@ -60,15 +101,13 @@ void method() {
                       AssertionsForClassTypes.assertThat(true).isTrue();
                       assertThat(true).isTrue();
                       assertThat(exampleList).hasSize(0);
-                      fail("This is a failure");
                   }
               }
               """,
             """
               import java.util.List;
 
               import static org.assertj.core.api.Assertions.assertThat;
-              import static org.assertj.core.api.Assertions.fail;
 
               public class Test {
                   List<String> exampleList;
@@ -77,7 +116,6 @@ void method() {
                       assertThat(true).isTrue();
                       assertThat(true).isTrue();
                       assertThat(exampleList).hasSize(0);
-                      fail("This is a failure");
                   }
               }
               """