Migrate junit.framework.Assert (#256)

Fixes #190

Author: Tim te Beek

src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java

@@ -61,10 +61,10 @@ public String getDescription() {
         return "Convert JUnit 4 `TestCase` to JUnit Jupiter.";
     }
 
-  @Override
-  public Duration getEstimatedEffortPerOccurrence() {
-    return Duration.ofMinutes(5);
-  }
+    @Override
+    public Duration getEstimatedEffortPerOccurrence() {
+        return Duration.ofMinutes(5);
+    }
 
     @Override
     protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
@@ -78,6 +78,7 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
                 }
 
                 doAfterVisit(new UsesType<>("junit.framework.TestCase"));
+                doAfterVisit(new UsesType<>("junit.framework.Assert"));
                 return cu;
             }
         };
@@ -92,6 +93,7 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
                 doAfterVisit(new TestCaseVisitor());
                 // ChangeType for org.junit.Assert method invocations because TestCase extends org.junit.Assert
                 doAfterVisit(new ChangeType("junit.framework.TestCase", "org.junit.Assert", true));
+                doAfterVisit(new ChangeType("junit.framework.Assert", "org.junit.Assert", true));
                 doAfterVisit(new AssertToAssertions.AssertToAssertionsVisitor());
                 doAfterVisit(new UseStaticImport("org.junit.jupiter.api.Assertions assert*(..)"));
                 doAfterVisit(new UseStaticImport("org.junit.jupiter.api.Assertions fail*(..)"));

…sting/junit5/MigrateJunitTestCaseTest.kt …sting/junit5/MigrateJUnitTestCaseTest.ktsrc/test/kotlin/org/openrewrite/java/testing/junit5/MigrateJunitTestCaseTest.kt renamed to src/test/kotlin/org/openrewrite/java/testing/junit5/MigrateJUnitTestCaseTest.kt src/test/kotlin/org/openrewrite/java/testing/junit5/MigrateJunitTestCaseTest.kt renamed to src/test/kotlin/org/openrewrite/java/testing/junit5/MigrateJUnitTestCaseTest.kt

@@ -21,7 +21,7 @@ import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
 
 @Suppress("JUnit3StyleTestMethodInJUnit4Class")
-class MigrateJunitTestCaseTest : JavaRecipeTest {
+class MigrateJUnitTestCaseTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .classpath("junit", "hamcrest")
         .build()
@@ -203,6 +203,40 @@ class MigrateJunitTestCaseTest : JavaRecipeTest {
         """
     )
 
+    @Test
+    fun notTestCaseHasAssertAssertion() = assertChanged(
+        before = """
+            import org.junit.Test;
+            
+            import static junit.framework.Assert.assertTrue;
+            
+            class AaTest {
+                @Test
+                public void someTest() {
+                    assertTrue("assert message", isSameStuff("stuff"));
+                }
+                private boolean isSameStuff(String stuff) {
+                    return "stuff".equals(stuff);
+                }
+            }
+        """,
+        after = """
+            import org.junit.Test;
+            
+            import static org.junit.jupiter.api.Assertions.assertTrue;
+            
+            class AaTest {
+                @Test
+                public void someTest() {
+                    assertTrue(isSameStuff("stuff"), "assert message");
+                }
+                private boolean isSameStuff(String stuff) {
+                    return "stuff".equals(stuff);
+                }
+            }
+        """
+    )
+
     @Test
     fun notTestCase() = assertUnchanged(
         before = """