Merge branch 'main' into debug/hamcrest-skips-is

openrewrite · Mar 14, 2024 · 1563038 · 1563038
2 parents 2be5898 + bcb4449
commit 1563038
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/src/main/resources/META-INF/rewrite/junit5.yml b/src/main/resources/META-INF/rewrite/junit5.yml
@@ -117,27 +117,7 @@ recipeList:
       groupId: org.junit.jupiter
       artifactId: junit-jupiter
       version: 5.x
-      onlyIfUsing: org.junit.Test
-      scope: test
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.junit.jupiter
-      artifactId: junit-jupiter
-      version: 5.x
-      onlyIfUsing: org.junit.jupiter.api.Test
-      acceptTransitive: true
-      scope: test
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.junit.jupiter
-      artifactId: junit-jupiter-api
-      version: 5.x
-      onlyIfUsing: org.junit.Test
-      scope: test
-  - org.openrewrite.java.dependencies.AddDependency:
-      groupId: org.junit.jupiter
-      artifactId: junit-jupiter-api
-      version: 5.x
-      onlyIfUsing: org.junit.jupiter.api.Test
-      acceptTransitive: true
+      onlyIfUsing: org.junit..*
       scope: test
   - org.openrewrite.java.dependencies.AddDependency:
       groupId: org.junit.jupiter
@@ -151,14 +131,21 @@ recipeList:
       artifactId: "*"
       newVersion: 3.x
       overrideManagedVersion: false
+  - org.openrewrite.java.dependencies.AddDependency:
+      groupId: org.mockito
+      artifactId: mockito-junit-jupiter
+      version: 3.x
+      onlyIfUsing: org.mockito..*
+      acceptTransitive: true
+      scope: test
   - org.openrewrite.maven.UpgradePluginVersion:
       groupId: org.apache.maven.plugins
       artifactId: maven-surefire-plugin
-      newVersion: 2.22.x
+      newVersion: 3.1.x
   - org.openrewrite.maven.UpgradePluginVersion:
       groupId: org.apache.maven.plugins
       artifactId: maven-failsafe-plugin
-      newVersion: 2.22.x
+      newVersion: 3.1.x
 
 ---
 type: specs.openrewrite.org/v1beta/recipe

diff --git a/src/test/java/org/openrewrite/java/testing/datafaker/JavaFakerToDataFakerTest.java b/src/test/java/org/openrewrite/java/testing/datafaker/JavaFakerToDataFakerTest.java
@@ -16,6 +16,7 @@
 package org.openrewrite.java.testing.datafaker;
 
 import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
@@ -30,6 +31,7 @@ public void defaults(RecipeSpec spec) {
           .parser(JavaParser.fromJavaVersion().classpath("javafaker", "datafaker"));
     }
 
+    @DocumentExample
     @Test
     void javaFakerToDataFaker() {
         rewriteRun(