Merge branch 'main' into additional-assertj-rules-recipes

Author: timtebeek

src/main/java/org/openrewrite/java/testing/cleanup/AssertLiteralBooleanToFail.java

@@ -40,8 +40,6 @@ void assertTrueBefore(String message) {
     }
 
     @AfterTemplate
-    // This annotation does not get taken into account
-    // resulting in Assertions.fail(message) being outputted
     @UseImportPolicy(value = STATIC_IMPORT_ALWAYS)
     void after(String message) {
         fail(message);

src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java

@@ -2960,14 +2960,23 @@ examples:
       import org.junit.Rule
       import org.junit.rules.TemporaryFolder
 
+      import java.io.File
+      import java.io.IOException
+
       class AbstractIntegrationTest {
           @TempDir
           File temporaryFolder
 
           def setup() {
               projectDir = temporaryFolder.root
-              buildFile = File.createTempFile('build.gradle', null, temporaryFolder)
-              settingsFile = File.createTempFile('settings.gradle', null, temporaryFolder)
+              buildFile = newFile(temporaryFolder, 'build.gradle')
+              settingsFile = newFile(temporaryFolder, 'settings.gradle')
+          }
+
+          private static File newFile(File parent, String child) throws IOException {
+              File result = new File(parent, child)
+              result.createNewFile()
+              return result
           }
       }
     language: groovy
@@ -3380,25 +3389,6 @@ examples:
 type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.mockito.Mockito1to5Migration
 examples:
-- description: ''
-  sources:
-  - before: |
-      <project>
-        <modelVersion>4.0.0</modelVersion>
-        <groupId>com.example</groupId>
-        <artifactId>demo</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <dependencies>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-inline</artifactId>
-                <version>3.11.2</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-      </project>
-    path: pom.xml
-    language: xml
 - description: ''
   sources:
   - before: |
@@ -3434,6 +3424,25 @@ examples:
           }
       }
     language: java
+- description: ''
+  sources:
+  - before: |
+      <project>
+        <modelVersion>4.0.0</modelVersion>
+        <groupId>com.example</groupId>
+        <artifactId>demo</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <dependencies>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-inline</artifactId>
+                <version>3.11.2</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+      </project>
+    path: pom.xml
+    language: xml
 ---
 type: specs.openrewrite.org/v1beta/example
 recipeName: org.openrewrite.java.testing.mockito.MockitoBestPractices

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

@@ -52,12 +52,12 @@ void test() {
               }
               """,
             """
-              import org.junit.jupiter.api.Assertions;
+              import static org.junit.jupiter.api.Assertions.fail;
 
               public class Test {
                   void test() {
-                      Assertions.fail("assert false true");
-                      Assertions.fail("assert true false");
+                      fail("assert false true");
+                      fail("assert true false");
                   }
               }
               """
@@ -82,12 +82,12 @@ void test() {
               }
               """,
             """
-              import org.junit.jupiter.api.Assertions;
+              import static org.junit.jupiter.api.Assertions.fail;
 
               public class Test {
                   void test() {
-                      Assertions.fail("assert false true");
-                      Assertions.fail("assert true false");
+                      fail("assert false true");
+                      fail("assert true false");
                   }
               }
               """

src/test/java/org/openrewrite/java/testing/cleanup/AssertLiteralBooleanToFailTest.java

@@ -22,7 +22,6 @@
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
-import org.openrewrite.test.TypeValidation;
 
 import static org.openrewrite.java.Assertions.java;
 

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

@@ -66,14 +66,23 @@ def setup() {
             import org.junit.Rule
             import org.junit.rules.TemporaryFolder
 
+            import java.io.File
+            import java.io.IOException
+
             class AbstractIntegrationTest {
                 @TempDir
                 File temporaryFolder
 
                 def setup() {
                     projectDir = temporaryFolder.root
-                    buildFile = File.createTempFile('build.gradle', null, temporaryFolder)
-                    settingsFile = File.createTempFile('settings.gradle', null, temporaryFolder)
+                    buildFile = newFile(temporaryFolder, 'build.gradle')
+                    settingsFile = newFile(temporaryFolder, 'settings.gradle')
+                }
+
+                private static File newFile(File parent, String child) throws IOException {
+                    File result = new File(parent, child)
+                    result.createNewFile()
+                    return result
                 }
             }
             """
@@ -476,7 +485,13 @@ public class MyTest {
                   @Test
                   public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
                       final String fileName = "SampleFile.txt";
-                      File f = File.createTempFile(fileName, null, tempFolder);
+                      File f = newFile(tempFolder, fileName);
+                  }
+
+                  private static File newFile(File parent, String child) throws IOException {
+                      File result = new File(parent, child);
+                      result.createNewFile();
+                      return result;
                   }
               }
               """
@@ -531,8 +546,14 @@ public class MyTest {
                   public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
                       final String fileName = "SampleFile.txt";
                       final String otherFileName = "otherText.txt";
-                      File f = File.createTempFile(fileName, null, tempFolder);
-                      File f2 = File.createTempFile(otherFileName, null, tempFolder2);
+                      File f = newFile(tempFolder, fileName);
+                      File f2 = newFile(tempFolder2, otherFileName);
+                  }
+
+                  private static File newFile(File parent, String child) throws IOException {
+                      File result = new File(parent, child);
+                      result.createNewFile();
+                      return result;
                   }
               }
               """