7 files changed, 28 insertions, 26 deletions

diff --git a/test/cuchaz/enigma/TestDeobfuscator.java b/test/cuchaz/enigma/TestDeobfuscator.java
index 45d27c40..6ac4c786 100644
--- a/test/cuchaz/enigma/TestDeobfuscator.java
+++ b/test/cuchaz/enigma/TestDeobfuscator.java
@@ -26,7 +26,7 @@ import cuchaz.enigma.mapping.ClassEntry;
 public class TestDeobfuscator {
         
         private Deobfuscator getDeobfuscator() throws IOException {
-                return new Deobfuscator(new File("build/libs/testLoneClass.obf.jar"));
+                return new Deobfuscator(new File("build/testLoneClass.obf.jar"));
         }
         
         @Test
diff --git a/test/cuchaz/enigma/TestInnerClasses.java b/test/cuchaz/enigma/TestInnerClasses.java
index c84d755e..51fb5e35 100644
--- a/test/cuchaz/enigma/TestInnerClasses.java
+++ b/test/cuchaz/enigma/TestInnerClasses.java
@@ -35,7 +35,7 @@ public class TestInnerClasses {
         
         public TestInnerClasses() throws Exception {
                 m_index = new JarIndex();
-                m_index.indexJar(new JarFile("build/libs/testInnerClasses.obf.jar"), true);
+                m_index.indexJar(new JarFile("build/testInnerClasses.obf.jar"), true);
         }
         
         @Test
diff --git a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
index b5f4c7f3..8e3ad6d2 100644
--- a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
@@ -37,7 +37,7 @@ public class TestJarIndexConstructorReferences {
         private ClassEntry m_callerClass = new ClassEntry("none/b");
         
         public TestJarIndexConstructorReferences() throws Exception {
-                File jarFile = new File("build/libs/testConstructors.obf.jar");
+                File jarFile = new File("build/testConstructors.obf.jar");
                 m_index = new JarIndex();
                 m_index.indexJar(new JarFile(jarFile), false);
         }
diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
index caf6578d..4d663972 100644
--- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -43,7 +43,7 @@ public class TestJarIndexInheritanceTree {
         
         public TestJarIndexInheritanceTree() throws Exception {
                 m_index = new JarIndex();
-                m_index.indexJar(new JarFile("build/libs/testInheritanceTree.obf.jar"), false);
+                m_index.indexJar(new JarFile("build/testInheritanceTree.obf.jar"), false);
         }
         
         @Test
@@ -63,27 +63,27 @@ public class TestJarIndexInheritanceTree {
                 TranslationIndex index = m_index.getTranslationIndex();
                 
                 // base class
-                assertThat(index.getSuperclassName(m_baseClass.getName()), is(nullValue()));
-                assertThat(index.getAncestry(m_baseClass.getName()), is(empty()));
-                assertThat(index.getSubclassNames(m_baseClass.getName()), containsInAnyOrder(
-                        m_subClassA.getName(),
-                        m_subClassB.getName()
+                assertThat(index.getSuperclass(m_baseClass), is(nullValue()));
+                assertThat(index.getAncestry(m_baseClass), is(empty()));
+                assertThat(index.getSubclass(m_baseClass), containsInAnyOrder(
+                        m_subClassA,
+                        m_subClassB
                 ));
                 
                 // subclass a
-                assertThat(index.getSuperclassName(m_subClassA.getName()), is(m_baseClass.getName()));
-                assertThat(index.getAncestry(m_subClassA.getName()), contains(m_baseClass.getName()));
-                assertThat(index.getSubclassNames(m_subClassA.getName()), contains(m_subClassAA.getName()));
+                assertThat(index.getSuperclass(m_subClassA), is(m_baseClass));
+                assertThat(index.getAncestry(m_subClassA), contains(m_baseClass));
+                assertThat(index.getSubclass(m_subClassA), contains(m_subClassAA));
                 
                 // subclass aa
-                assertThat(index.getSuperclassName(m_subClassAA.getName()), is(m_subClassA.getName()));
-                assertThat(index.getAncestry(m_subClassAA.getName()), contains(m_subClassA.getName(), m_baseClass.getName()));
-                assertThat(index.getSubclassNames(m_subClassAA.getName()), is(empty()));
+                assertThat(index.getSuperclass(m_subClassAA), is(m_subClassA));
+                assertThat(index.getAncestry(m_subClassAA), contains(m_subClassA, m_baseClass));
+                assertThat(index.getSubclass(m_subClassAA), is(empty()));
                 
                 // subclass b
-                assertThat(index.getSuperclassName(m_subClassB.getName()), is(m_baseClass.getName()));
-                assertThat(index.getAncestry(m_subClassB.getName()), contains(m_baseClass.getName()));
-                assertThat(index.getSubclassNames(m_subClassB.getName()), is(empty()));
+                assertThat(index.getSuperclass(m_subClassB), is(m_baseClass));
+                assertThat(index.getAncestry(m_subClassB), contains(m_baseClass));
+                assertThat(index.getSubclass(m_subClassB), is(empty()));
         }
         
         @Test
diff --git a/test/cuchaz/enigma/TestJarIndexLoneClass.java b/test/cuchaz/enigma/TestJarIndexLoneClass.java
index 0575eec3..a061b72d 100644
--- a/test/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/test/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -29,6 +29,7 @@ import cuchaz.enigma.analysis.JarIndex;
 import cuchaz.enigma.analysis.MethodImplementationsTreeNode;
 import cuchaz.enigma.analysis.MethodInheritanceTreeNode;
 import cuchaz.enigma.mapping.BehaviorEntry;
+import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.FieldEntry;
 import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Translator;
@@ -39,7 +40,7 @@ public class TestJarIndexLoneClass {
         
         public TestJarIndexLoneClass() throws Exception {
                 m_index = new JarIndex();
-                m_index.indexJar(new JarFile("build/libs/testLoneClass.obf.jar"), false);
+                m_index.indexJar(new JarFile("build/testLoneClass.obf.jar"), false);
         }
         
         @Test
@@ -52,12 +53,12 @@ public class TestJarIndexLoneClass {
         
         @Test
         public void translationIndex() {
-                assertThat(m_index.getTranslationIndex().getSuperclassName("none/a"), is(nullValue()));
-                assertThat(m_index.getTranslationIndex().getSuperclassName("cuchaz/enigma/inputs/Keep"), is(nullValue()));
-                assertThat(m_index.getTranslationIndex().getAncestry("none/a"), is(empty()));
-                assertThat(m_index.getTranslationIndex().getAncestry("cuchaz/enigma/inputs/Keep"), is(empty()));
-                assertThat(m_index.getTranslationIndex().getSubclassNames("none/a"), is(empty()));
-                assertThat(m_index.getTranslationIndex().getSubclassNames("cuchaz/enigma/inputs/Keep"), is(empty()));
+                assertThat(m_index.getTranslationIndex().getSuperclass(new ClassEntry("none/a")), is(nullValue()));
+                assertThat(m_index.getTranslationIndex().getSuperclass(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(nullValue()));
+                assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("none/a")), is(empty()));
+                assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(empty()));
+                assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("none/a")), is(empty()));
+                assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(empty()));
         }
         
         @Test
diff --git a/test/cuchaz/enigma/TestSourceIndex.java b/test/cuchaz/enigma/TestSourceIndex.java
index fb385e06..ba7fc797 100644
--- a/test/cuchaz/enigma/TestSourceIndex.java
+++ b/test/cuchaz/enigma/TestSourceIndex.java
@@ -23,6 +23,7 @@ import cuchaz.enigma.mapping.ClassEntry;
 
 public class TestSourceIndex {
         
+        // TEMP
         @Test
         public void indexEverything() throws Exception {
                 Deobfuscator deobfuscator = new Deobfuscator(new File("input/1.8.jar"));
diff --git a/test/cuchaz/enigma/TestTokensConstructors.java b/test/cuchaz/enigma/TestTokensConstructors.java
index f805a655..9f85e81d 100644
--- a/test/cuchaz/enigma/TestTokensConstructors.java
+++ b/test/cuchaz/enigma/TestTokensConstructors.java
@@ -27,7 +27,7 @@ import cuchaz.enigma.mapping.BehaviorEntry;
 public class TestTokensConstructors extends TokenChecker {
         
         public TestTokensConstructors() throws Exception {
-                super(new File("build/libs/testConstructors.obf.jar"));
+                super(new File("build/testConstructors.obf.jar"));
         }
         
         @Test