Mostly resolve test failures

8 files changed, 60 insertions, 66 deletions

diff --git a/src/test/java/cuchaz/enigma/TestDeobfed.java b/src/test/java/cuchaz/enigma/TestDeobfed.java
index 3d875df..3ee86cb 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfed.java
+++ b/src/test/java/cuchaz/enigma/TestDeobfed.java
@@ -66,11 +66,12 @@ public class TestDeobfed {
         }
 
         @Test
-        public void decompile()
-                throws Exception {
+        public void decompile() {
                 EnigmaProject project = new EnigmaProject(enigma, classCache, index);
 
-                SourceProvider sourceProvider = project.getObfSourceProvider();
+                CompiledSourceTypeLoader typeLoader = new CompiledSourceTypeLoader(project.getClassCache());
+                SourceProvider sourceProvider = new SourceProvider(SourceProvider.createSettings(), typeLoader);
+
                 sourceProvider.getSources("a");
                 sourceProvider.getSources("b");
                 sourceProvider.getSources("c");
diff --git a/src/test/java/cuchaz/enigma/TestDeobfuscator.java b/src/test/java/cuchaz/enigma/TestDeobfuscator.java
index 5b9611c..2a6fec4 100644
--- a/src/test/java/cuchaz/enigma/TestDeobfuscator.java
+++ b/src/test/java/cuchaz/enigma/TestDeobfuscator.java
@@ -11,47 +11,31 @@
 
 package cuchaz.enigma;
 
-import com.google.common.collect.Lists;
-import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.jar.JarFile;
-
-import static org.junit.Assert.assertEquals;
+import java.nio.file.Paths;
 
 public class TestDeobfuscator {
 
-        private Enigma getDeobfuscator()
-                throws IOException {
-                return new Enigma(new JarFile("build/test-obf/loneClass.jar"));
+        private EnigmaProject openProject() throws IOException {
+                Enigma enigma = Enigma.create();
+                return enigma.openJar(Paths.get("build/test-obf/loneClass.jar"), ProgressListener.none());
         }
 
         @Test
         public void loadJar()
                 throws Exception {
-                getDeobfuscator();
+                openProject();
         }
 
         @Test
-        public void getClasses()
-                throws Exception {
-                Enigma enigma = getDeobfuscator();
-                List<ClassEntry> obfClasses = Lists.newArrayList();
-                List<ClassEntry> deobfClasses = Lists.newArrayList();
-                enigma.getSeparatedClasses(obfClasses, deobfClasses);
-                assertEquals(1, obfClasses.size());
-                assertEquals("a", obfClasses.get(0).getName());
-                assertEquals(1, deobfClasses.size());
-                assertEquals("cuchaz/enigma/inputs/Keep", deobfClasses.get(0).getName());
-        }
+        public void decompileClass() throws Exception {
+                EnigmaProject project = openProject();
+
+                CompiledSourceTypeLoader typeLoader = new CompiledSourceTypeLoader(project.getClassCache());
+                SourceProvider sourceProvider = new SourceProvider(SourceProvider.createSettings(), typeLoader);
 
-        @Test
-        public void decompileClass()
-                throws Exception {
-                Enigma enigma = getDeobfuscator();
-                SourceProvider sourceProvider = enigma.getObfSourceProvider();
                 sourceProvider.writeSourceToString(sourceProvider.getSources("a"));
         }
 }
diff --git a/src/test/java/cuchaz/enigma/TestInnerClasses.java b/src/test/java/cuchaz/enigma/TestInnerClasses.java
index b6e4e2d..18e4936 100644
--- a/src/test/java/cuchaz/enigma/TestInnerClasses.java
+++ b/src/test/java/cuchaz/enigma/TestInnerClasses.java
@@ -17,7 +17,6 @@ import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import org.junit.Test;
 
 import java.nio.file.Paths;
-import java.util.jar.JarFile;
 
 import static cuchaz.enigma.TestEntryFactory.newClass;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,14 +33,14 @@ public class TestInnerClasses {
         private static final ClassEntry ClassTreeLevel2 = newClass("f$a$a");
         private static final ClassEntry ClassTreeLevel3 = newClass("f$a$a$a");
         private JarIndex index;
-        private Enigma enigma;
+        private SourceProvider sourceProvider;
 
-        public TestInnerClasses()
-                throws Exception {
+        public TestInnerClasses() throws Exception {
                 ClassCache classCache = ClassCache.of(Paths.get("build/test-obf/innerClasses.jar"));
                 index = classCache.index(ProgressListener.none());
 
-                enigma = new Enigma(jar);
+                CompiledSourceTypeLoader typeLoader = new CompiledSourceTypeLoader(classCache);
+                sourceProvider = new SourceProvider(SourceProvider.createSettings(), typeLoader);
         }
 
         @Test
@@ -80,6 +79,6 @@ public class TestInnerClasses {
         }
 
         private void decompile(ClassEntry classEntry) {
-                enigma.getObfSourceProvider().getSources(classEntry.getName());
+                sourceProvider.getSources(classEntry.getName());
         }
 }
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
index 0712ccf..48975c8 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java
@@ -11,6 +11,7 @@
 
 package cuchaz.enigma;
 
+import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
@@ -18,9 +19,8 @@ import cuchaz.enigma.translation.representation.entry.MethodDefEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import org.junit.Test;
 
-import java.io.File;
+import java.nio.file.Paths;
 import java.util.Collection;
-import java.util.jar.JarFile;
 
 import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -36,11 +36,9 @@ public class TestJarIndexConstructorReferences {
         private ClassEntry defaultClass = newClass("c");
         private ClassEntry callerClass = newClass("b");
 
-        public TestJarIndexConstructorReferences()
-                        throws Exception {
-                File jarFile = new File("build/test-obf/constructors.jar");
-                index = JarIndex.empty();
-                index.indexJar(new ParsedJar(new JarFile(jarFile)), s -> {});
+        public TestJarIndexConstructorReferences() throws Exception {
+                ClassCache classCache = ClassCache.of(Paths.get("build/test-obf/constructors.jar"));
+                index = classCache.index(ProgressListener.none());
         }
 
         @Test
diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
index 1299bcc..103c366 100644
--- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -23,9 +23,9 @@ import cuchaz.enigma.translation.representation.entry.MethodDefEntry;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import org.junit.Test;
 
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.List;
-import java.util.jar.JarFile;
 
 import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,10 +35,9 @@ public class TestJarIndexLoneClass {
 
         private JarIndex index;
 
-        public TestJarIndexLoneClass()
-                        throws Exception {
-                index = JarIndex.empty();
-                index.indexJar(new ParsedJar(new JarFile("build/test-obf/loneClass.jar")), s -> {});
+        public TestJarIndexLoneClass() throws Exception {
+                ClassCache classCache = ClassCache.of(Paths.get("build/test-obf/loneClass.jar"));
+                index = classCache.index(ProgressListener.none());
         }
 
         @Test
diff --git a/src/test/java/cuchaz/enigma/TestSourceIndex.java b/src/test/java/cuchaz/enigma/TestSourceIndex.java
index 8a604f8..b1d1182 100644
--- a/src/test/java/cuchaz/enigma/TestSourceIndex.java
+++ b/src/test/java/cuchaz/enigma/TestSourceIndex.java
@@ -13,13 +13,15 @@ package cuchaz.enigma;
 
 import com.google.common.collect.Sets;
 import com.strobel.decompiler.languages.java.ast.CompilationUnit;
+import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.SourceIndex;
+import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import org.junit.Test;
 
-import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Set;
-import java.util.jar.JarFile;
 
 public class TestSourceIndex {
         @Test
@@ -27,31 +29,41 @@ public class TestSourceIndex {
                 throws Exception {
                 // Figure out where Minecraft is...
                 final String mcDir = System.getProperty("enigma.test.minecraftdir");
-                File mcJar = null;
+                Path mcJar = null;
                 if (mcDir == null) {
                         String osname = System.getProperty("os.name").toLowerCase();
                         if (osname.contains("nix") || osname.contains("nux") || osname.contains("solaris")) {
-                                mcJar = new File(System.getProperty("user.home"), ".minecraft/versions/1.8.3/1.8.3.jar");
+                                mcJar = Paths.get(System.getProperty("user.home"), ".minecraft/versions/1.8.3/1.8.3.jar");
                         } else if (osname.contains("mac") || osname.contains("darwin")) {
-                                mcJar = new File(System.getProperty("user.home"), "Library/Application Support/minecraft/versions/1.8.3/1.8.3.jar");
+                                mcJar = Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/versions/1.8.3/1.8.3.jar");
                         } else if (osname.contains("win")) {
-                                mcJar = new File(System.getenv("AppData"), ".minecraft/versions/1.8.3/1.8.3.jar");
+                                mcJar = Paths.get(System.getenv("AppData"), ".minecraft/versions/1.8.3/1.8.3.jar");
                         }
                 } else {
-                        mcJar = new File(mcDir, "versions/1.8.3/1.8.3.jar");
+                        mcJar = Paths.get(mcDir, "versions/1.8.3/1.8.3.jar");
                 }
 
-                Enigma enigma = new Enigma(new JarFile(mcJar));
+                if (mcJar == null) {
+                        throw new NullPointerException("Couldn't find jar");
+                }
+
+                Enigma enigma = Enigma.create();
+                EnigmaProject project = enigma.openJar(mcJar, ProgressListener.none());
+
+                ClassCache classCache = project.getClassCache();
+                JarIndex index = project.getJarIndex();
+
+                CompiledSourceTypeLoader typeLoader = new CompiledSourceTypeLoader(classCache);
+                SourceProvider sourceProvider = new SourceProvider(SourceProvider.createSettings(), typeLoader);
 
                 // get all classes that aren't inner classes
                 Set<ClassEntry> classEntries = Sets.newHashSet();
-                for (ClassEntry obfClassEntry : enigma.getJarIndex().getEntryIndex().getClasses()) {
+                for (ClassEntry obfClassEntry : index.getEntryIndex().getClasses()) {
                         if (!obfClassEntry.isInnerClass()) {
                                 classEntries.add(obfClassEntry);
                         }
                 }
 
-                SourceProvider sourceProvider = enigma.getObfSourceProvider();
                 for (ClassEntry obfClassEntry : classEntries) {
                         try {
                                 CompilationUnit tree = sourceProvider.getSources(obfClassEntry.getName());
diff --git a/src/test/java/cuchaz/enigma/TestTokensConstructors.java b/src/test/java/cuchaz/enigma/TestTokensConstructors.java
index 1ee0bde..0398de4 100644
--- a/src/test/java/cuchaz/enigma/TestTokensConstructors.java
+++ b/src/test/java/cuchaz/enigma/TestTokensConstructors.java
@@ -14,7 +14,7 @@ package cuchaz.enigma;
 import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import org.junit.Test;
 
-import java.util.jar.JarFile;
+import java.nio.file.Paths;
 
 import static cuchaz.enigma.TestEntryFactory.newBehaviorReferenceByMethod;
 import static cuchaz.enigma.TestEntryFactory.newMethod;
@@ -25,7 +25,7 @@ public class TestTokensConstructors extends TokenChecker {
 
         public TestTokensConstructors()
                         throws Exception {
-                super(new JarFile("build/test-obf/constructors.jar"));
+                super(Paths.get("build/test-obf/constructors.jar"));
         }
 
         @Test
diff --git a/src/test/java/cuchaz/enigma/TokenChecker.java b/src/test/java/cuchaz/enigma/TokenChecker.java
index 9e0c696..1dde034 100644
--- a/src/test/java/cuchaz/enigma/TokenChecker.java
+++ b/src/test/java/cuchaz/enigma/TokenChecker.java
@@ -13,28 +13,30 @@ package cuchaz.enigma;
 
 import com.google.common.collect.Lists;
 import com.strobel.decompiler.languages.java.ast.CompilationUnit;
+import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.analysis.SourceIndex;
 import cuchaz.enigma.analysis.Token;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
-import java.util.jar.JarFile;
 
 public class TokenChecker {
 
-        private Enigma enigma;
+        private SourceProvider sourceProvider;
 
-        protected TokenChecker(JarFile jarFile)
-                throws IOException {
-                enigma = new Enigma(jarFile);
+        protected TokenChecker(Path path) throws IOException {
+                ClassCache classCache = ClassCache.of(path);
+
+                CompiledSourceTypeLoader typeLoader = new CompiledSourceTypeLoader(classCache);
+                sourceProvider = new SourceProvider(SourceProvider.createSettings(), typeLoader);
         }
 
         protected String getDeclarationToken(Entry<?> entry) {
                 // decompile the class
-                SourceProvider sourceProvider = enigma.getObfSourceProvider();
                 CompilationUnit tree = sourceProvider.getSources(entry.getContainingClass().getFullName());
                 // DEBUG
                 // tree.acceptVisitor( new TreeDumpVisitor( new File( "tree." + entry.getClassName().replace( '/', '.' ) + ".txt" ) ), null );
@@ -52,7 +54,6 @@ public class TokenChecker {
         @SuppressWarnings("unchecked")
         protected Collection<String> getReferenceTokens(EntryReference<? extends Entry<?>, ? extends Entry<?>> reference) {
                 // decompile the class
-                SourceProvider sourceProvider = enigma.getObfSourceProvider();
                 CompilationUnit tree = sourceProvider.getSources(reference.context.getContainingClass().getFullName());
                 String source = sourceProvider.writeSourceToString(tree);
                 SourceIndex index = SourceIndex.buildIndex(source, tree, true);