Mostly resolve test failures

1 files changed, 10 insertions, 26 deletions

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"));
         }
 }