Add mockito-junit-jupiter when using runner in JUnit 4 (#670)

* [640] - check for junit4 mockito runners to add mockito-junit-jupiter

* Update expectation after upstream v0.20.0 release of EPS

* Use selective dependencies & run specific recipe

* Drop the ineffective AddDependency from `Mockito1to3Migration`

* Fix similar issue identified for Vertx

---------

Co-authored-by: Tim te Beek <[email protected]>

Author: promanenko

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

@@ -196,6 +196,13 @@ tags:
   - junit
   - mockito
 recipeList:
+  - org.openrewrite.java.dependencies.AddDependency:
+      groupId: org.mockito
+      artifactId: mockito-junit-jupiter
+      version: 4.x
+      onlyIfUsing: org.mockito..MockitoJUnit*Runner
+      acceptTransitive: true
+      scope: test
   - org.openrewrite.java.testing.mockito.Mockito1to4Migration
   - org.openrewrite.java.testing.mockito.MockitoJUnitRunnerSilentToExtension
   - org.openrewrite.java.testing.junit5.RunnerToExtension:
@@ -246,7 +253,7 @@ recipeList:
       groupId: io.vertx
       artifactId: vertx-junit5
       version: 4.x
-      onlyIfUsing: io.vertx.junit5.VertxExtension
+      onlyIfUsing: org.vertx.testtools.VertxUnitRunner
       acceptTransitive: true
 ---
 type: specs.openrewrite.org/v1beta/recipe

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

@@ -168,13 +168,6 @@ recipeList:
   - org.openrewrite.java.testing.mockito.MockUtilsToStatic
   - org.openrewrite.java.testing.junit5.MockitoJUnitToMockitoExtension
   - org.openrewrite.java.testing.mockito.ReplacePowerMockito
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.mockito
-      artifactId: mockito-junit-jupiter
-      version: 3.x
-      onlyIfUsing: org.mockito.junit.jupiter.*
-      acceptTransitive: true
-      scope: test
   - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
       groupId: org.mockito
       artifactId: "*"

src/test/java/org/openrewrite/java/testing/junit5/JUnit5MigrationTest.java

@@ -31,7 +31,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.gradle.Assertions.buildGradle;
 import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
-import static org.openrewrite.java.Assertions.java;
+import static org.openrewrite.java.Assertions.*;
 import static org.openrewrite.maven.Assertions.pomXml;
 
 @SuppressWarnings({"NewClassNamingConvention", "EqualsWithItself", "deprecation", "LanguageMismatch"})
@@ -40,7 +40,7 @@ class JUnit5MigrationTest implements RewriteTest {
     public void defaults(RecipeSpec spec) {
         spec
           .parser(JavaParser.fromJavaVersion()
-            .classpathFromResources(new InMemoryExecutionContext(), "junit-4.13", "hamcrest-2.2"))
+            .classpathFromResources(new InMemoryExecutionContext(), "junit-4.13"))
           .recipe(Environment.builder()
             .scanRuntimeClasspath("org.openrewrite.java.testing.junit5")
             .build()
@@ -81,6 +81,9 @@ void method() {
     void assertThatReceiver() {
         //language=java
         rewriteRun(
+          spec -> spec
+            .parser(JavaParser.fromJavaVersion()
+              .classpathFromResources(new InMemoryExecutionContext(), "junit-4.13", "hamcrest-2.2")),
           java(
             """
               import org.junit.Assert;
@@ -440,4 +443,91 @@ void bumpSurefireOnOlderMavenVersions() {
           )
         );
     }
+
+    @Test
+    void addMockitoJupiterDependencyIfExtendWithPresent() {
+        rewriteRun(
+          spec -> spec
+            .parser(JavaParser.fromJavaVersion()
+              .classpathFromResources(new InMemoryExecutionContext(), "junit-4.13", "mockito-all-1.10"))
+            .recipe(Environment.builder()
+              .scanRuntimeClasspath("org.openrewrite.java.testing.junit5")
+              .build()
+              .activateRecipes("org.openrewrite.java.testing.junit5.UseMockitoExtension")),
+          mavenProject("sample",
+            //language=java
+            srcMainJava(
+              java(
+                """
+                  import org.junit.runner.RunWith;
+                  import org.mockito.runners.MockitoJUnitRunner;
+
+                  @RunWith(MockitoJUnitRunner.class)
+                  public class MyClassTest {}
+                  """,
+                """
+                  import org.junit.jupiter.api.extension.ExtendWith;
+                  import org.mockito.junit.jupiter.MockitoExtension;
+
+                  @ExtendWith(MockitoExtension.class)
+                  public class MyClassTest {}
+                  """
+              )
+            ),
+            //language=xml
+            pomXml(
+              """
+                <project>
+                    <modelVersion>4.0.0</modelVersion>
+                    <groupId>org.example</groupId>
+                    <artifactId>project</artifactId>
+                    <version>0.0.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>junit</groupId>
+                            <artifactId>junit</artifactId>
+                            <version>4.12</version>
+                            <scope>test</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.mockito</groupId>
+                            <artifactId>mockito-core</artifactId>
+                            <version>2.23.4</version>
+                            <scope>test</scope>
+                        </dependency>
+                    </dependencies>
+                </project>
+                """,
+              """
+                <project>
+                    <modelVersion>4.0.0</modelVersion>
+                    <groupId>org.example</groupId>
+                    <artifactId>project</artifactId>
+                    <version>0.0.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>junit</groupId>
+                            <artifactId>junit</artifactId>
+                            <version>4.12</version>
+                            <scope>test</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.mockito</groupId>
+                            <artifactId>mockito-core</artifactId>
+                            <version>4.11.0</version>
+                            <scope>test</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.mockito</groupId>
+                            <artifactId>mockito-junit-jupiter</artifactId>
+                            <version>4.11.0</version>
+                            <scope>test</scope>
+                        </dependency>
+                    </dependencies>
+                </project>
+                """
+            )
+          )
+        );
+    }
 }