Implement fail() migration

Philzen · Jun 12, 2024 · 25a7d94 · 25a7d94
1 parent d760e6f
commit 25a7d94
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 7 deletions.
diff --git a/src/main/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateAssertions.java b/src/main/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateAssertions.java
@@ -245,8 +245,6 @@ public static class MigrateAssertNullWithMsg {
             Assertions.assertNull(expr, msg);
         }
     }
-<<<<<<< HEAD
-=======
 
     @RecipeDescriptor(
             name = "Replace `Assert#assertNotNull(Object)`",
@@ -322,5 +320,4 @@ public static class MigrateFailWithMessageAndCause {
             Assertions.fail(message, cause);
         }
     }
->>>>>>> 3c937e8 (fixup! Implement assertNull() migration)
 }
diff --git a/src/test/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateAssertionsTests.java b/src/test/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateAssertionsTests.java
@@ -549,7 +549,8 @@ void testMethod() {
 
         @Test void withErrorMessage() {
             //language=java
-            rewriteRun(java("""
+            rewriteRun(java(
+                """
                 import org.testng.Assert;
                 
                 class MyTest {
@@ -572,7 +573,8 @@ void testMethod() {
 
         @Test void withoutErrorMessage() {
             //language=java
-            rewriteRun(java("""
+            rewriteRun(java(
+                """
                 import org.testng.Assert;
                 
                 class MyTest {
@@ -599,7 +601,8 @@ void testMethod() {
 
         @Test void withErrorMessage() {
             // language=java
-            rewriteRun(java("""
+            rewriteRun(java(
+                """
                 import org.testng.Assert;
                 
                 class MyTest {
@@ -622,7 +625,8 @@ void testMethod() {
 
         @Test void withoutErrorMessage() {
             // language=java
-            rewriteRun(java("""
+            rewriteRun(java(
+                """
                 import org.testng.Assert;
                 
                 class MyTest {
@@ -643,4 +647,80 @@ void testMethod() {
             ));
         }
     }
+
+    @Nested class MigrateFail {
+
+        @Test void withNoArguments() {
+            //language=java
+            rewriteRun(java(
+                """
+                import org.testng.Assert;
+                
+                class MyTest {
+                    void testMethod() {
+                        Assert.fail();
+                    }
+                }
+                """,
+                """
+                import org.junit.jupiter.api.Assertions;
+                
+                class MyTest {
+                    void testMethod() {
+                        Assertions.fail();
+                    }
+                }
+                """
+            ));
+        }
+
+        @Test void withMessage() {
+            // language=java
+            rewriteRun(java(
+                """
+                import org.testng.Assert;
+                
+                class MyTest {
+                    void testMethod() {
+                        Assert.fail("Boom!");
+                    }
+                }
+                """,
+                """
+                import org.junit.jupiter.api.Assertions;
+                
+                class MyTest {
+                    void testMethod() {
+                        Assertions.fail("Boom!");
+                    }
+                }
+                """
+            ));
+        }
+
+        @Test void withMessageAndException() {
+            rewriteRun(
+              // language=java
+              java(
+                """
+                import org.testng.Assert;
+                
+                class MyTest {
+                    void testMethod() {
+                        Assert.fail("Boom!", new Exception("Halted and caught fire."));
+                    }
+                }
+                """,
+                """
+                import org.junit.jupiter.api.Assertions;
+                
+                class MyTest {
+                    void testMethod() {
+                        Assertions.fail("Boom!", new Exception("Halted and caught fire."));
+                    }
+                }
+                """
+            ));
+        }
+    }
 }