Figure out platform classes from java.home

5 files changed, 73 insertions, 47 deletions

diff --git a/src/test/java/org/javacs/ChildFirstClassLoaderTest.java b/src/test/java/org/javacs/ChildFirstClassLoaderTest.java
deleted file mode 100644
index a32574c..0000000
--- a/src/test/java/org/javacs/ChildFirstClassLoaderTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.javacs;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class ChildFirstClassLoaderTest {
-    class ExceptionClassLoader extends ClassLoader {
-        @Override
-        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-            throw new RuntimeException("This should never be called");
-        }
-    }
-
-    @Test
-    public void dontCallParent() throws ClassNotFoundException {
-        String[] packages = {"org.javacs"};
-        ClassLoader childFirst =
-                ChildFirstClassLoader.fromClassPath(
-                        System.getProperty("java.class.path"),
-                        packages,
-                        new ExceptionClassLoader());
-        Class<?> found = childFirst.loadClass("org.javacs.ChildFirstClassLoaderTest");
-        assertThat("found ChildFirstClassLoaderTest", found, not(nullValue()));
-        assertThat(
-                "reloaded ChildFirstClassLoaderTest",
-                found,
-                not(equalTo(ChildFirstClassLoaderTest.class)));
-    }
-}
diff --git a/src/test/java/org/javacs/ClassPathIndexTest.java b/src/test/java/org/javacs/ClassPathIndexTest.java
new file mode 100644
index 0000000..99a3d4a
--- /dev/null
+++ b/src/test/java/org/javacs/ClassPathIndexTest.java
@@ -0,0 +1,73 @@
+package org.javacs;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.common.reflect.ClassPath;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.Optional;
+import org.junit.Test;
+
+public class ClassPathIndexTest {
+
+    @Test
+    public void createEmptyLoader() throws ClassNotFoundException {
+        ClassLoader emptyClassLoader = ClassPathIndex.parentClassLoader();
+
+        assertThat(emptyClassLoader.loadClass("java.util.ArrayList"), not(nullValue()));
+
+        try {
+            Class<?> found = emptyClassLoader.loadClass("com.google.common.collect.Lists");
+
+            fail("Found " + found);
+        } catch (ClassNotFoundException e) {
+            // OK
+        }
+    }
+
+    @Test
+    public void java8Platform() throws IOException {
+        String javaHome =
+                Paths.get("./src/test/test-platforms/jdk8-home").toAbsolutePath().toString();
+        URL[] resources = ClassPathIndex.java8Platform(javaHome);
+        assertThat(
+                "found example.jar",
+                resources,
+                hasItemInArray(hasToString(containsString("rt.jar"))));
+        ClassPath classPath = ClassPath.from(new URLClassLoader(resources, null));
+        assertThat(
+                classPath.getTopLevelClasses(),
+                hasItem(hasProperty("simpleName", equalTo("HelloWorld"))));
+    }
+
+    @Test
+    public void java9Platform() throws IOException {
+        String javaHome =
+                Paths.get("./src/test/test-platforms/jdk9-home").toAbsolutePath().toString();
+        URL[] resources = ClassPathIndex.java9Platform(javaHome);
+        assertThat(
+                "found java.compiler.jmod",
+                resources,
+                hasItemInArray(hasToString(containsString("java.compiler.jmod"))));
+        ClassPath classPath = ClassPath.from(new URLClassLoader(resources, null));
+        assertThat(
+                classPath.getTopLevelClasses(),
+                hasItem(hasProperty("simpleName", equalTo("JavaCompiler"))));
+    }
+
+    @Test
+    public void topLevelClasses() {
+        ClassPathIndex index = new ClassPathIndex(Collections.emptySet());
+        Optional<ClassPath.ClassInfo> arrayList =
+                index.topLevelClasses()
+                        .filter(c -> c.getName().equals("java.util.ArrayList"))
+                        .findFirst();
+        assertTrue("java.util.ArrayList is on the classpath", arrayList.isPresent());
+    }
+}
diff --git a/src/test/java/org/javacs/CompletionsTest.java b/src/test/java/org/javacs/CompletionsTest.java
index 0bd6ffe..ce1455d 100644
--- a/src/test/java/org/javacs/CompletionsTest.java
+++ b/src/test/java/org/javacs/CompletionsTest.java
@@ -5,7 +5,6 @@ import static org.junit.Assert.*;
 
 import com.google.common.collect.Lists;
 import java.io.IOException;
-import java.net.URLClassLoader;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -542,21 +541,6 @@ public class CompletionsTest extends CompletionsBase {
     }
 
     @Test
-    public void createEmptyLoader() throws ClassNotFoundException {
-        URLClassLoader emptyClassLoader = ClassPathIndex.parentClassLoader();
-
-        assertThat(emptyClassLoader.loadClass("java.util.ArrayList"), not(nullValue()));
-
-        try {
-            Class<?> found = emptyClassLoader.loadClass("com.google.common.collect.Lists");
-
-            fail("Found " + found);
-        } catch (ClassNotFoundException e) {
-            // OK
-        }
-    }
-
-    @Test
     public void emptyClasspath() throws IOException {
         String file = "/org/javacs/example/AutocompletePackage.java";
 
diff --git a/src/test/test-platforms/jdk8-home/lib/rt.jar b/src/test/test-platforms/jdk8-home/lib/rt.jar
new file mode 100644
index 0000000..4ed10a9
--- /dev/null
+++ b/src/test/test-platforms/jdk8-home/lib/rt.jar
diff --git a/src/test/test-platforms/jdk9-home/jmods/java.compiler.jmod b/src/test/test-platforms/jdk9-home/jmods/java.compiler.jmod
new file mode 100644
index 0000000..3d13129
--- /dev/null
+++ b/src/test/test-platforms/jdk9-home/jmods/java.compiler.jmod