Test fixes

Author: tkvangorder

src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt

@@ -293,8 +293,8 @@ class JUnitAssertEqualsToAssertThatTest : JavaRecipeTest {
     @Test
     fun fullyQualifiedMethodWithMessage() = assertChanged(
         before = """
-            import java.io.File;
             import org.junit.Test;
+            import java.io.File;
 
             public class A {
 
@@ -309,7 +309,6 @@ class JUnitAssertEqualsToAssertThatTest : JavaRecipeTest {
         """,
         after = """
             import org.junit.Test;
-
             import java.io.File;
 
             import static org.assertj.core.api.Assertions.assertThat;

src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt

@@ -293,8 +293,8 @@ class JUnitAssertNotEqualsToAssertThatTest : JavaRecipeTest {
     @Test
     fun fullyQualifiedMethodWithMessage() = assertChanged(
         before = """
-            import java.io.File;
             import org.junit.Test;
+            import java.io.File;
 
             public class A {
 
@@ -309,7 +309,6 @@ class JUnitAssertNotEqualsToAssertThatTest : JavaRecipeTest {
         """,
         after = """
             import org.junit.Test;
-
             import java.io.File;
 
             import static org.assertj.core.api.Assertions.assertThat;

src/test/kotlin/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertionsTest.kt

@@ -172,6 +172,7 @@ class TestsShouldIncludeAssertionsTest : JavaRecipeTest {
             import org.mockito.Mock;
             import org.learning.math.MyMathService;
             import static org.mockito.Mockito.when;
+            import org.learning.math.Stuff;
             
             class AaTest {
                 @Mock
@@ -186,11 +187,12 @@ class TestsShouldIncludeAssertionsTest : JavaRecipeTest {
         """,
         after = """
             import org.junit.jupiter.api.Test;
-            import org.learning.math.MyMathService;
             import org.mockito.Mock;
+            import org.learning.math.MyMathService;
             
             import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
             import static org.mockito.Mockito.when;
+            import org.learning.math.Stuff;
             
             class AaTest {
                 @Mock

src/test/kotlin/org/openrewrite/java/testing/junit5/MockitoJUnitToMockitoExtensionTest.kt

@@ -136,12 +136,12 @@ class MockitoJUnitToMockitoExtensionTest : JavaRecipeTest {
             }
         """,
         after = """
+            import java.util.List;
+
             import org.junit.jupiter.api.extension.ExtendWith;
             import org.mockito.Mock;
             import org.mockito.junit.jupiter.MockitoExtension;
 
-            import java.util.List;
-
             @ExtendWith(MockitoExtension.class)
             class A {
 
@@ -182,12 +182,12 @@ class MockitoJUnitToMockitoExtensionTest : JavaRecipeTest {
             }
         """,
         after = """
+            import java.util.List;
+
             import org.junit.jupiter.api.extension.ExtendWith;
             import org.mockito.Mock;
             import org.mockito.junit.jupiter.MockitoExtension;
 
-            import java.util.List;
-
             @ExtendWith(MockitoExtension.class)
             class A {
 

src/test/kotlin/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDirTest.kt

@@ -225,8 +225,8 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
     fun newFolderWithArgs() = assertChanged(
         before = """
             import org.junit.Test;
-            import org.junit.Rule;
             import org.junit.rules.TemporaryFolder;
+            import org.junit.Rule;
             
             import java.io.File;
             import java.io.IOException;