Add api-guardian to prevent warnings.

tkvangorder · tkvangorder · commit a2792d68f9d7 · 2022-08-03T10:02:32.000-07:00
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThat.java
@@ -64,7 +64,7 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
     public static class AssertArrayEqualsToAssertThatVisitor extends JavaIsoVisitor<ExecutionContext> {
         private static final MethodMatcher JUNIT_ASSERT_EQUALS = new MethodMatcher(JUNIT_QUALIFIED_ASSERTIONS_CLASS_NAME + " assertArrayEquals(..)");
         private static final Supplier<JavaParser> ASSERTIONS_PARSER = () -> JavaParser.fromJavaVersion()
-                .dependsOn(Parser.Input.fromResource("/META-INF/rewrite/AssertJAssertions.java", "---")).logCompilationWarningsAndErrors(true).build();
+                .dependsOn(Parser.Input.fromResource("/META-INF/rewrite/AssertJAssertions.java", "---")).build();
 
         @Override
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention", "ExcessiveLambdaUsage", "RedundantArrayCreation")
 class JUnitAssertArrayEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention", "UnnecessaryBoxing", "ExcessiveLambdaUsage")
 class JUnitAssertEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .logCompilationWarningsAndErrors(true)
         .build()
 
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThatTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention", "ConstantConditions", "ExcessiveLambdaUsage")
 class JUnitAssertFalseToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention", "UnnecessaryBoxing", "ExcessiveLambdaUsage")
 class JUnitAssertNotEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThatTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention", "ExcessiveLambdaUsage")
 class JUnitAssertNotNullToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThatTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class JUnitAssertNullToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser
         get() = JavaParser.fromJavaVersion()
-            .classpath("junit")
+            .classpath("junit", "apiguardian-api")
             .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThatTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention", "ExcessiveLambdaUsage")
 class JUnitAssertSameToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThatTest.kt
@@ -25,7 +25,7 @@ class JUnitAssertTrueToAssertThatTest : JavaRecipeTest {
 
     override val parser: JavaParser
         get() = JavaParser.fromJavaVersion()
-            .classpath("junit")
+            .classpath("junit", "apiguardian-api")
             .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFailTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFailTest.kt
@@ -25,7 +25,7 @@ class JUnitFailToAssertJFailTest : JavaRecipeTest {
 
     override val parser: JavaParser
         get() = JavaParser.fromJavaVersion()
-            .classpath("junit")
+            .classpath("junit", "apiguardian-api")
             .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertEqualsNullToAssertNullTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertEqualsNullToAssertNullTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertEqualsNullToAssertNullTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertFalseEqualToAssertNotEqualsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertFalseEqualToAssertNotEqualsTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertFalseEqualToAssertNotEqualsTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertFalseNegationToAssertTrueTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertFalseNegationToAssertTrueTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertFalseNegationToAssertTrueTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertFalseNullToAssertNotNullTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertFalseNullToAssertNotNullTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertFalseNullToAssertNotNullTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueComparisonToAssertEqualsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueComparisonToAssertEqualsTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertTrueComparisonToAssertEqualsTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueEqualsToAssertEqualsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueEqualsToAssertEqualsTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertTrueEqualsToAssertEqualsTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueNegationToAssertFalseTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueNegationToAssertFalseTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertTrueNegationToAssertFalseTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueNullToAssertNullTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/AssertTrueNullToAssertNullTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class AssertTrueNullToAssertNullTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
         .logCompilationWarningsAndErrors(true)
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/RemoveTestPrefixTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/RemoveTestPrefixTest.kt
@@ -22,7 +22,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class RemoveTestPrefixTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit-jupiter-api")
+        .classpath("junit-jupiter-api", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublicTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublicTest.kt
@@ -22,7 +22,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class TestsShouldNotBePublicTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit-jupiter-api", "junit-jupiter-params")
+        .classpath("junit-jupiter-api", "junit-jupiter-params", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/CategoryToTagTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/CategoryToTagTest.kt
@@ -22,8 +22,8 @@ import org.openrewrite.java.JavaRecipeTest
 
 class CategoryToTagTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-            .classpath("junit")
-            .build()
+        .classpath("junit", "apiguardian-api")
+        .build()
 
     override val recipe: Recipe
         get() = CategoryToTag()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/CleanupAssertionsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/CleanupAssertionsTest.kt
@@ -28,7 +28,7 @@ class CleanupAssertionsTest : RewriteTest {
                 .build()
                 .activateRecipes("org.openrewrite.java.testing.junit5.CleanupAssertions"))
             .parser(JavaParser.fromJavaVersion()
-                .classpath("junit-jupiter-api")
+                .classpath("junit-jupiter-api", "apiguardian-api")
                 .build())
     }
 
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/CleanupJUnitImportsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/CleanupJUnitImportsTest.kt
@@ -21,7 +21,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class CleanupJUnitImportsTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe = CleanupJUnitImports()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/EnclosedToNestedTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/EnclosedToNestedTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.test.RewriteTest
 class EnclosedToNestedTest : RewriteTest {
     override fun defaults(spec: RecipeSpec) {
         spec.recipe(EnclosedToNested())
-            .parser(JavaParser.fromJavaVersion().classpath("junit").logCompilationWarningsAndErrors(true).build())
+            .parser(JavaParser.fromJavaVersion().classpath("junit", "apiguardian-api").logCompilationWarningsAndErrors(true).build())
     }
 
     @Test
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/JUnit5BestPracticesTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/JUnit5BestPracticesTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class JUnit5BestPracticesTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe = Environment.builder()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/RemoveObsoleteRunnersTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/RemoveObsoleteRunnersTest.kt
@@ -21,7 +21,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class RemoveObsoleteRunnersTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe = RemoveObsoleteRunners(
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/StaticImportsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/StaticImportsTest.kt
@@ -24,7 +24,7 @@ class StaticImportsTest : JavaRecipeTest {
     @Test
     fun useAssertionsStaticImport() = assertChanged(
         parser = JavaParser.fromJavaVersion()
-                .classpath("junit-jupiter-api")
+                .classpath("junit-jupiter-api", "apiguardian-api")
                 .build(),
         recipe = Environment.builder()
             .scanRuntimeClasspath("org.openrewrite.java.testing.junit5")
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDirTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDirTest.kt
@@ -23,7 +23,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class TemporaryFolderToTempDirTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/TestRuleToTestInfoTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/TestRuleToTestInfoTest.kt
@@ -22,7 +22,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class TestRuleToTestInfoTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
     override val recipe: Recipe
         get() = TestRuleToTestInfo()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/UpdateBeforeAfterAnnotationsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/UpdateBeforeAfterAnnotationsTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class UpdateBeforeAfterAnnotationsTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/UpdateMockWebServerTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/UpdateMockWebServerTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 class UpdateMockWebServerTest : JavaRecipeTest {
 
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .dependsOn("package okhttp3.mockwebserver; public class MockWebServer implements Closeable {}")
         .build()
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/UpdateTestAnnotationTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/UpdateTestAnnotationTest.kt
@@ -24,7 +24,7 @@ import org.openrewrite.java.JavaRecipeTest
 @Suppress("NewClassNamingConvention")
 class UpdateTestAnnotationTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe: Recipe
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/UseTestMethodOrderTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/UseTestMethodOrderTest.kt
@@ -22,7 +22,7 @@ import org.openrewrite.java.JavaRecipeTest
 
 class UseTestMethodOrderTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
-        .classpath("junit")
+        .classpath("junit", "apiguardian-api")
         .build()
 
     override val recipe = UseTestMethodOrder()
