Fix imports on format-document

3 files changed, 27 insertions, 29 deletions

diff --git a/src/test/java/org/javacs/FixImportsTest.java b/src/test/java/org/javacs/FixImportsTest.java
deleted file mode 100644
index 786c6fa..0000000
--- a/src/test/java/org/javacs/FixImportsTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.javacs;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import java.nio.file.*;
-import java.util.*;
-import org.junit.Test;
-
-public class FixImportsTest {
-    FixImports fix = new FixImports(new ClassPathIndex(Collections.emptySet()));
-    FixImports.ExistingImports emptyImports =
-            new FixImports.ExistingImports(Collections.emptySet(), Collections.emptySet());
-
-    @Test
-    public void findJavaUtilList() {
-        Map<String, String> resolved = fix.resolveSymbols(Collections.singleton("List"), emptyImports);
-        assertThat(resolved, hasEntry("List", "java.util.List"));
-    }
-
-    @Test
-    public void findExistingImports() {
-        FixImports.ExistingImports find =
-                fix.existingImports(Collections.singleton(JavaCompilerServiceTest.resourcesDir()));
-        assertThat(find.classes, hasItem("java.util.List"));
-        assertThat(find.packages, hasItem("java.util"));
-    }
-}
diff --git a/src/test/java/org/javacs/JavaCompilerServiceTest.java b/src/test/java/org/javacs/JavaCompilerServiceTest.java
index a067323..d993968 100644
--- a/src/test/java/org/javacs/JavaCompilerServiceTest.java
+++ b/src/test/java/org/javacs/JavaCompilerServiceTest.java
@@ -285,7 +285,7 @@ public class JavaCompilerServiceTest {
     @Test
     public void fixImports() {
         Set<String> qualifiedNames =
-                compiler.fixImports(resourceUri("/MissingImport.java"), contents("/MissingImport.java"));
+                compiler.fixImports(resourceUri("/MissingImport.java"), contents("/MissingImport.java")).fixedImports;
         assertThat(qualifiedNames, hasItem("java.util.List"));
     }
 }
diff --git a/src/test/java/org/javacs/ParserFixImportsTest.java b/src/test/java/org/javacs/ParserFixImportsTest.java
new file mode 100644
index 0000000..f1896a9
--- /dev/null
+++ b/src/test/java/org/javacs/ParserFixImportsTest.java
@@ -0,0 +1,26 @@
+package org.javacs;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import java.nio.file.*;
+import java.util.*;
+import org.junit.Test;
+
+public class ParserFixImportsTest {
+    ClassPathIndex classPath = new ClassPathIndex(Collections.emptySet());
+    ExistingImports emptyImports = new ExistingImports(Collections.emptySet(), Collections.emptySet());
+
+    @Test
+    public void findJavaUtilList() {
+        Map<String, String> resolved = Parser.resolveSymbols(Collections.singleton("List"), emptyImports, classPath);
+        assertThat(resolved, hasEntry("List", "java.util.List"));
+    }
+
+    @Test
+    public void findExistingImports() {
+        ExistingImports find = Parser.existingImports(Collections.singleton(JavaCompilerServiceTest.resourcesDir()));
+        assertThat(find.classes, hasItem("java.util.List"));
+        assertThat(find.packages, hasItem("java.util"));
+    }
+}