Also reorder imports in MisformattedTestData

PiperOrigin-RevId: 888754531

Author: cushon

core/src/main/java/com/google/errorprone/bugpatterns/MisformattedTestData.java

@@ -36,6 +36,8 @@
 import com.google.errorprone.matchers.Matcher;
 import com.google.googlejavaformat.java.Formatter;
 import com.google.googlejavaformat.java.FormatterException;
+import com.google.googlejavaformat.java.ImportOrderer;
+import com.google.googlejavaformat.java.JavaFormatterOptions.Style;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.LiteralTree;
 import com.sun.source.tree.MethodInvocationTree;
@@ -71,7 +73,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
     Formatter formatter = new Formatter();
     String formattedSource;
     try {
-      formattedSource = formatter.formatSource(string);
+      formattedSource = ImportOrderer.reorderImports(formatter.formatSource(string), Style.GOOGLE);
     } catch (FormatterException exception) {
       return NO_MATCH;
     }

core/src/test/java/com/google/errorprone/bugpatterns/MisformattedTestDataTest.java

@@ -266,4 +266,59 @@ void method() {
             """)
         .doTest(TEXT_MATCH);
   }
+
+  @Test
+  public void reorderImports() {
+    refactoringHelper
+        .addInputLines(
+            "Test.java",
+            """
+            import com.google.errorprone.BugCheckerRefactoringTestHelper;
+
+            class Test {
+              void method(BugCheckerRefactoringTestHelper h) {
+                h.addInputLines(
+                    "Test.java",
+                    \"""
+                    package foo;
+
+                    import java.util.List;
+                    import static java.lang.Math.min;
+
+                    class Test {
+                      int method(List<Integer> xs) {
+                        return min(xs.get(0), xs.get(1));
+                      }
+                    }
+                    \""");
+              }
+            }
+            """)
+        .addOutputLines(
+            "Test.java",
+            """
+            import com.google.errorprone.BugCheckerRefactoringTestHelper;
+
+            class Test {
+              void method(BugCheckerRefactoringTestHelper h) {
+                h.addInputLines(
+                    "Test.java",
+                    \"""
+                    package foo;
+
+                    import static java.lang.Math.min;
+
+                    import java.util.List;
+
+                    class Test {
+                      int method(List<Integer> xs) {
+                        return min(xs.get(0), xs.get(1));
+                      }
+                    }
+                    \""");
+               }
+            }
+            """)
+        .doTest(TEXT_MATCH);
+  }
 }