Merge branch 'master' of github.com:openrewrite/rewrite-testing-frameworks

Greg Adams · Greg Adams · commit 6d1a748880c0 · 2021-02-23T18:30:16.000-08:00
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -57,7 +57,7 @@
  *
  * </PRE>
  */
-public class AssertArrayEqualsToAssertThat extends Recipe {
+public class JUnitAssertArrayEqualsToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -57,7 +57,7 @@
  *
  * </PRE>
  */
-public class AssertEqualsToAssertThat extends Recipe {
+public class JUnitAssertEqualsToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -44,7 +44,7 @@
  * shim method to support these method signatures, however, those shims would need to exist on each compilation
  * unit or in a shared testing utilities library.
  */
-public class AssertFalseToAssertThat extends Recipe {
+public class JUnitAssertFalseToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
@@ -111,4 +111,4 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             return method;
         }
     }
-}
+}
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -57,7 +57,7 @@
  *
  * </PRE>
  */
-public class AssertNotEqualsToAssertThat extends Recipe {
+public class JUnitAssertNotEqualsToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -39,7 +39,7 @@
  * assertNotNull(Object actual, Supplier<String> messageSupplier) -> assertThat(condition).withFailMessage(messageSupplier).isNotNull();
  * </PRE>
  */
-public class AssertNotNullToAssertThat extends Recipe {
+public class JUnitAssertNotNullToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -39,7 +39,7 @@
  * assertNull(Object actual, Supplier<String> messageSupplier) -> assertThat(condition).withFailMessage(messageSupplier).isNull();
  * </PRE>
  */
-public class AssertNullToAssertThat extends Recipe {
+public class JUnitAssertNullToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Parser;
@@ -39,7 +39,7 @@
  * assertSame(Object expected, Object actual, Supplier<String> messageSupplier) -> assertThat(actual).withFailMessage(messageSupplier).isSameAs(expected);
  * </PRE>
  */
-public class AssertSameToAssertThat extends Recipe {
+public class JUnitAssertSameToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
@@ -111,4 +111,4 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             return method;
         }
     }
-}
+}
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThat.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 
 import org.openrewrite.ExecutionContext;
@@ -45,7 +45,7 @@
  * shim method to support these method signatures, however, those shims would need to exist on each compilation
  * unit or in a shared testing utilities library.
  */
-public class AssertTrueToAssertThat extends Recipe {
+public class JUnitAssertTrueToAssertThat extends Recipe {
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getVisitor() {
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.*;
 import org.openrewrite.java.JavaIsoVisitor;
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/package-info.java b/src/main/java/org/openrewrite/java/testing/assertj/package-info.java
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 @NonNullApi
-package org.openrewrite.java.testing.junitassertj;
+package org.openrewrite.java.testing.assertj;
 
 import org.openrewrite.internal.lang.NonNullApi;
diff --git a/src/main/resources/META-INF/rewrite/AssertJAssertions.java b/src/main/resources/META-INF/rewrite/AssertJAssertions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020 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.assertj.core.api;
 import java.io.*;
 
diff --git a/src/main/resources/META-INF/rewrite/assertj.yml b/src/main/resources/META-INF/rewrite/assertj.yml
@@ -0,0 +1,46 @@
+#
+# Copyright 2020 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.
+#
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.testing.assertj.Assertj
+recipeList:
+  - org.openrewrite.java.testing.assertj.StaticImports
+  - org.openrewrite.java.testing.assertj.JUnitToAssertj
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.testing.assertj.StaticImports
+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"
+  - org.openrewrite.java.UseStaticImport:
+      methodPattern: "org.assertj.core.api.Assertions *(..)"
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.testing.assertj.JUnitToAssertj
+recipeList:
+  - org.openrewrite.java.testing.assertj.JUnitAssertArrayEqualsToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertEqualsToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertFalseToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertNotEqualsToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertNotNullToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertNullToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertSameToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitAssertTrueToAssertThat
+  - org.openrewrite.java.testing.assertj.JUnitJUnitFailToAssertJFail
diff --git a/src/main/resources/META-INF/rewrite/junit5-assertions-to-assertj.yml b/src/main/resources/META-INF/rewrite/junit5-assertions-to-assertj.yml
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj
+package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Parser
@@ -22,13 +22,13 @@ import org.openrewrite.java.JavaRecipeTest
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.tree.J
 
-class AssertArrayEqualsToAssertThatTest : JavaRecipeTest {
+class JUnitAssertArrayEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: Parser<J.CompilationUnit> = JavaParser.fromJavaVersion()
             .classpath("junit")
             .build()
 
     override val recipe: Recipe
-        get() = AssertArrayEqualsToAssertThat()
+        get() = JUnitAssertArrayEqualsToAssertThat()
 
     @Test
     fun singleStaticMethodNoMessage() = assertChanged(
@@ -323,4 +323,4 @@ class AssertArrayEqualsToAssertThatTest : JavaRecipeTest {
                 }
             """
     )
-}
+}
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj
+package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Parser
@@ -22,13 +22,13 @@ import org.openrewrite.java.JavaRecipeTest
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.tree.J
 
-class AssertEqualsToAssertThatTest : JavaRecipeTest {
+class JUnitAssertEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: Parser<J.CompilationUnit> = JavaParser.fromJavaVersion()
             .classpath("junit")
             .build()
 
     override val recipe: Recipe
-        get() = AssertEqualsToAssertThat()
+        get() = JUnitAssertEqualsToAssertThat()
 
     @Test
     fun singleStaticMethodNoMessage() = assertChanged(
@@ -324,4 +324,4 @@ class AssertEqualsToAssertThatTest : JavaRecipeTest {
             """
     )
 
-}
+}
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThatTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj
+package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Parser
@@ -22,13 +22,13 @@ import org.openrewrite.java.JavaRecipeTest
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.tree.J
 
-class AssertFalseToAssertThatTest : JavaRecipeTest {
+class JUnitAssertFalseToAssertThatTest : JavaRecipeTest {
     override val parser: Parser<J.CompilationUnit> = JavaParser.fromJavaVersion()
             .classpath("junit")
             .build()
 
     override val recipe: Recipe
-        get() = AssertFalseToAssertThat()
+        get() = JUnitAssertFalseToAssertThat()
 
     @Test
     fun singleStaticMethodNoMessage() = assertChanged(
@@ -263,4 +263,4 @@ class AssertFalseToAssertThatTest : JavaRecipeTest {
                 }
             """
     )
-}
+}
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openrewrite.java.testing.junitassertj
+package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Parser
@@ -22,13 +22,13 @@ import org.openrewrite.java.JavaRecipeTest
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.tree.J
 
-class AssertNotEqualsToAssertThatTest : JavaRecipeTest {
+class JUnitAssertNotEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: Parser<J.CompilationUnit> = JavaParser.fromJavaVersion()
             .classpath("junit")
             .build()
 
     override val recipe: Recipe
-        get() = AssertNotEqualsToAssertThat()
+        get() = JUnitAssertNotEqualsToAssertThat()
 
     @Test
     fun singleStaticMethodNoMessage() = assertChanged(
@@ -324,4 +324,4 @@ class AssertNotEqualsToAssertThatTest : JavaRecipeTest {
             """
     )
 
-}
+}
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThatTest.kt
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThatTest.kt
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThatTest.kt
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThatTest.kt
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFailTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFailTest.kt
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/StaticImportsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/StaticImportsTest.kt
