Suggestions

PicnicSupermarket · Dec 18, 2023 · d640a18 · d640a18
1 parent f81c88b
commit d640a18
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 24 deletions.
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -1,4 +1,3 @@
 --batch-mode
 --errors
 --strict-checksums
--Dstyle.color=always
diff --git a/error-prone-contrib/pom.xml b/error-prone-contrib/pom.xml
@@ -194,7 +194,7 @@
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java-11</artifactId>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
@@ -271,11 +271,6 @@
                                 <artifactId>refaster-support</artifactId>
                                 <version>${project.version}</version>
                             </path>
-                            <path>
-                                <groupId>org.openrewrite</groupId>
-                                <artifactId>rewrite-templating</artifactId>
-                                <version>${version.rewrite-templating}</version>
-                            </path>
                         </annotationProcessorPaths>
                         <compilerArgs combine.children="append">
                             <arg>-Xplugin:RefasterRuleCompiler</arg>

diff --git a/...ne-contrib/src/test/java/tech/picnic/errorprone/refasterrules/StringRulesRecipesTest.java b/...ne-contrib/src/test/java/tech/picnic/errorprone/refasterrules/StringRulesRecipesTest.java
@@ -1,16 +1,20 @@
 package tech.picnic.errorprone.refasterrules;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.openrewrite.java.Assertions.java;
 
-import com.google.errorprone.FileObjects;
+import com.google.common.io.Resources;
 import java.io.IOException;
-import javax.tools.JavaFileObject;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
+// XXX: This class currently validates the OpenRewrite recipe generation by applying a single
+// recipe. Generalize this setup to cover all generated recipes (for _all_ Refaster rule
+// collections), ideally by reusing the `RefasterRulesTest` test resources. (This may introduce
+// additional hurdles, as OpenRewrite removes obsolete imports, while Refaster doesn't.)
 final class StringRulesRecipesTest implements RewriteTest {
   @Override
   public void defaults(RecipeSpec spec) {
@@ -21,30 +25,32 @@ public void defaults(RecipeSpec spec) {
   void stringValueOf() {
     // XXX: Use text blocks once supported.
     rewriteRun(
-        // language=java
         java(
             "import java.util.Objects;\n"
+                + '\n'
                 + "class Test {\n"
-                + "    String test(Object object) {\n"
-                + "        return Objects.toString(object);\n"
-                + "    }\n"
-                + "}",
+                + "  String test(Object object) {\n"
+                + "    return Objects.toString(object);\n"
+                + "  }\n"
+                + '}',
             "class Test {\n"
-                + "    String test(Object object) {\n"
-                + "        return String.valueOf(object);\n"
-                + "    }\n"
-                + "}"));
+                + "  String test(Object object) {\n"
+                + "    return String.valueOf(object);\n"
+                + "  }\n"
+                + '}'));
   }
 
-  @Test
   @Disabled("Not all rules are currently supported")
-  void reuseStringRulesTestInputOutput() throws IOException {
-    String rule = "StringRules";
-    JavaFileObject before = FileObjects.forResource(getClass(), rule + "TestInput.java");
-    JavaFileObject after = FileObjects.forResource(getClass(), rule + "TestOutput.java");
+  @Test
+  void allRules() throws IOException {
     rewriteRun(
         spec ->
             spec.parser(JavaParser.fromJavaVersion().classpath("guava", "refaster-test-support")),
-        java(before.getCharContent(true).toString(), after.getCharContent(true).toString()));
+        java(
+            loadResource("StringRulesTestInput.java"), loadResource("StringRulesTestOutput.java")));
+  }
+
+  private String loadResource(String resource) throws IOException {
+    return Resources.toString(Resources.getResource(getClass(), resource), UTF_8);
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -456,6 +456,13 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!-- Specified as a workaround for
+            https://github.com/mojohaus/versions-maven-plugin/issues/244. -->
+            <dependency>
+                <groupId>org.openrewrite</groupId>
+                <artifactId>rewrite-templating</artifactId>
+                <version>${version.rewrite-templating}</version>
+            </dependency>
             <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-recipe-bom</artifactId>
@@ -943,6 +950,11 @@
                                 <artifactId>mockito-errorprone</artifactId>
                                 <version>${version.mockito}</version>
                             </path>
+                            <path>
+                                <groupId>org.openrewrite</groupId>
+                                <artifactId>rewrite-templating</artifactId>
+                                <version>${version.rewrite-templating}</version>
+                            </path>
                         </annotationProcessorPaths>
                         <compilerArgs>
                             <arg>--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>

diff --git a/refaster-runner/pom.xml b/refaster-runner/pom.xml
@@ -87,6 +87,21 @@
             <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-java</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-templating</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/refaster-test-support/pom.xml b/refaster-test-support/pom.xml
@@ -69,6 +69,21 @@
             <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-java</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-templating</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>