Reader access flags directly from class file

2 files changed, 16 insertions, 8 deletions

diff --git a/src/test/java/org/javacs/ClassesTest.java b/src/test/java/org/javacs/ClassesTest.java
index 95212fe..c5e2a7e 100644
--- a/src/test/java/org/javacs/ClassesTest.java
+++ b/src/test/java/org/javacs/ClassesTest.java
@@ -16,18 +16,16 @@ public class ClassesTest {
     @Test
     public void list() {
         var jdk = Classes.jdkTopLevelClasses();
-        assertThat(jdk.classes(), hasItem("java.util.List"));
-        assertThat(jdk.load("java.util.List"), not(nullValue()));
+        assertThat(jdk, hasItem("java.util.List"));
 
         var empty = Classes.classPathTopLevelClasses(Collections.emptySet());
-        assertThat(empty.classes(), not(hasItem("java.util.List")));
+        assertThat(empty, not(hasItem("java.util.List")));
     }
 
     @Test
     public void arrayList() {
         var jdk = Classes.jdkTopLevelClasses();
-        assertThat(jdk.classes(), hasItem("java.util.ArrayList"));
-        assertThat(jdk.load("java.util.ArrayList"), not(nullValue()));
+        assertThat(jdk, hasItem("java.util.ArrayList"));
     }
 
     @Test
@@ -46,9 +44,6 @@ public class ClassesTest {
 
         var main = found.stream().filter(c -> c.getName().equals("org.javacs.Main")).findFirst();
         assertTrue(main.isPresent());
-
-        var load = main.get().load();
-        assertNotNull(load);
     }
 
     void ancestors(ClassLoader classLoader) {
diff --git a/src/test/java/org/javacs/SourceFileManagerTest.java b/src/test/java/org/javacs/SourceFileManagerTest.java
index 64a35ac..3b50327 100644
--- a/src/test/java/org/javacs/SourceFileManagerTest.java
+++ b/src/test/java/org/javacs/SourceFileManagerTest.java
@@ -71,5 +71,18 @@ public class SourceFileManagerTest {
         assertThat(sourceClassName, equalTo(standardJavaName));
     }
 
+    @Test
+    public void javaUtilList() throws IOException {
+        var file =
+                sourceFileManager.getJavaFileForInput(
+                        StandardLocation.PLATFORM_CLASS_PATH, "java.util.List", JavaFileObject.Kind.CLASS);
+        assertThat("Found java.util.List in platform classpath", file, notNullValue());
+
+        var header = ClassHeader.of(file.openInputStream());
+        assertTrue(header.isInterface);
+        assertTrue(header.isAbstract);
+        assertTrue(header.isPublic);
+    }
+
     private static final Logger LOG = Logger.getLogger("main");
 }