test polish

aegershman · aegershman · commit 3aad055d4563 · 2021-09-02T17:00:23.000-05:00
optimize imports
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java b/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java
@@ -15,9 +15,6 @@
  */
 package org.openrewrite.java.testing.cleanup;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
@@ -33,6 +30,9 @@
 import org.openrewrite.java.tree.J.Modifier.Type;
 import org.openrewrite.java.tree.TypeUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TestsShouldNotBePublic extends Recipe {
 
     @Override
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java
@@ -20,7 +20,10 @@
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.*;
 import org.openrewrite.java.search.UsesType;
-import org.openrewrite.java.tree.*;
+import org.openrewrite.java.tree.Expression;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.java.tree.TextComment;
 import org.openrewrite.marker.Markers;
 
 import java.util.*;
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java b/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java
@@ -25,7 +25,10 @@
 import org.openrewrite.java.marker.JavaSearchResult;
 import org.openrewrite.java.search.FindAnnotations;
 import org.openrewrite.java.search.UsesType;
-import org.openrewrite.java.tree.*;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.java.tree.TextComment;
+import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.marker.Marker;
 import org.openrewrite.marker.Markers;
 
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt
@@ -16,12 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.TypeValidator
-import org.openrewrite.java.tree.J
 
 class JUnitAssertArrayEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertEqualsToAssertThatTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitAssertEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertFalseToAssertThatTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitAssertFalseToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotEqualsToAssertThatTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitAssertNotEqualsToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNotNullToAssertThatTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitAssertNotNullToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertNullToAssertThatTest.kt
@@ -19,7 +19,6 @@ import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.TypeValidator
 
 class JUnitAssertNullToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertSameToAssertThatTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitAssertSameToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertTrueToAssertThatTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitAssertTrueToAssertThatTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFailTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitFailToAssertJFailTest.kt
@@ -16,11 +16,9 @@
 package org.openrewrite.java.testing.assertj
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.Recipe
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.java.tree.J
 
 class JUnitFailToAssertJFailTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/AssumeToAssumptionsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/AssumeToAssumptionsTest.kt
@@ -17,7 +17,6 @@ package org.openrewrite.java.testing.junit5
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Issue
-import org.openrewrite.RecipeTest
 import org.openrewrite.config.Environment
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/CategoryToTagTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/CategoryToTagTest.kt
@@ -17,8 +17,8 @@ package org.openrewrite.java.testing.junit5
 
 import org.junit.jupiter.api.Test
 import org.openrewrite.Recipe
-import org.openrewrite.java.JavaRecipeTest
 import org.openrewrite.java.JavaParser
+import org.openrewrite.java.JavaRecipeTest
 
 class CategoryToTagTest : JavaRecipeTest {
     override val parser: JavaParser = JavaParser.fromJavaVersion()
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/RunnerToExtensionTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/RunnerToExtensionTest.kt
@@ -16,7 +16,6 @@
 package org.openrewrite.java.testing.junit5
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Parser
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
 
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/TestRuleToTestInfoTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/TestRuleToTestInfoTest.kt
@@ -48,7 +48,7 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
             import org.junit.jupiter.api.TestInfo;
 
             public class SomeTest {
-            
+                
                 public String name;
                 protected String randomName() {
                     return name;
@@ -98,6 +98,7 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
 
             public class SomeTest {
                 protected int count;
+                
                 public String name;
                 protected String randomName() {
                     return name;
diff --git a/src/test/kotlin/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.kt b/src/test/kotlin/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.kt
@@ -15,16 +15,11 @@
  */
 package org.openrewrite.java.testing.mockito
 
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import org.openrewrite.InMemoryExecutionContext
 import org.openrewrite.Recipe
-import org.openrewrite.SourceFile
 import org.openrewrite.config.Environment
 import org.openrewrite.java.JavaParser
 import org.openrewrite.java.JavaRecipeTest
-import org.openrewrite.maven.MavenParser
 
 /**
  * Validates the recipes related to upgrading from Mockito 1 to Mockito 3
