Prepare for new version of rewrite core that will fix issues with OrderImports

Author: sambsnyd

src/before/java/org/openrewrite/java/testing/junit5/ExampleJunitTestClass.java

@@ -100,4 +100,10 @@ public void lambdaThrow() {
 
     @Test(timeout = 500)
     public void bar() { }
+
+    @Test
+    public void aTest() {
+        String foo = mock(String.class);
+        when(foo.concat(any())).then(invocation -> invocation.getArgumentAt(0, String.class));
+    }
 }

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

@@ -39,12 +39,14 @@ visitors:
   - org.openrewrite.java.ChangeType:
       type: org.junit.Assume
       targetType: org.junit.jupiter.api.Assumptions
----
-type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.java.testing.junit5.RemoveUnusedImports
-visitors:
-  - org.openrewrite.java.OrderImports:
-      removeUnused: true
+# Uncomment once a version of rewrite core libs has been published containing this commit:
+# https://github.com/openrewrite/rewrite/commit/8fe84fa49e6233882014d08e99c5793d5e02b36a
+#---
+#type: specs.openrewrite.org/v1beta/visitor
+#name: org.openrewrite.java.testing.junit5.RemoveUnusedImports
+#visitors:
+#  - org.openrewrite.java.OrderImports:
+#      removeUnused: true
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.JUnit5Migration

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

@@ -44,12 +44,14 @@ visitors:
   - org.openrewrite.java.ChangeType:
       type: org.mockito.runners.MockitoJUnitRunner
       targetType: org.mockito.junit.MockitoJUnitRunner
----
-type: specs.openrewrite.org/v1beta/visitor
-name: org.openrewrite.java.testing.mockito.RemoveUnusedImports
-visitors:
-  - org.openrewrite.java.OrderImports:
-      removeUnused: true
+# Uncomment once a version of rewrite core libs has been published containing this commit:
+# https://github.com/openrewrite/rewrite/commit/8fe84fa49e6233882014d08e99c5793d5e02b36a
+#---
+#type: specs.openrewrite.org/v1beta/visitor
+#name: org.openrewrite.java.testing.mockito.RemoveUnusedImports
+#visitors:
+#  - org.openrewrite.java.OrderImports:
+#      removeUnused: true
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.testing.Mockito1to3Migration

src/test/kotlin/org/openrewrite/java/testing/BeforeToAfter.kt

@@ -18,6 +18,7 @@ package org.openrewrite.java.testing
 import org.openrewrite.Refactor
 import org.openrewrite.loadVisitorsForTest
 import org.openrewrite.java.JavaParser
+import org.openrewrite.java.OrderImports
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -30,7 +31,11 @@ fun main(args: Array<String>) {
             .classpath("mockito-all", "junit")
             .build()
 
-    val visitors = loadVisitorsForTest("org.openrewrite.java.testing.JUnit5Migration", "org.openrewrite.java.testing.Mockito1to3Migration")
+    val visitors = loadVisitorsForTest(
+            "org.openrewrite.java.testing.JUnit5Migration",
+            "org.openrewrite.java.testing.Mockito1to3Migration"
+    )
+
     val sources = parser.parse(listJavaSources(beforeDir), beforeDir)
     val changes = Refactor(true)
             .visit(visitors)

src/test/kotlin/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.kt

@@ -28,8 +28,8 @@ class JunitMockitoUpgradeIntegrationTest : RefactorVisitorTestForParser<J.Compil
     override val parser: JavaParser = JavaParser.fromJavaVersion()
             .classpath("mockito-all", "junit")
             .build()
-    override val visitors: Iterable<RefactorVisitor<*>> = //loadVisitorsForTest("org.openrewrite.java.testing.JUnit5Migration", "org.openrewrite.java.testing.Mockito1to3Migration")
-        listOf(OrderImports().apply { setRemoveUnused(true) })
+    override val visitors: Iterable<RefactorVisitor<*>> = loadVisitorsForTest("org.openrewrite.java.testing.JUnit5Migration", "org.openrewrite.java.testing.Mockito1to3Migration")
+
     /**
      * Replace org.mockito.MockitoAnnotations.Mock with org.mockito.Mock
      */