From c7a3de184dc51526ee157d47981a74ffba284f5d Mon Sep 17 00:00:00 2001
From: Cuchaz
Date: Sun, 24 May 2015 11:23:36 -0400
Subject: fix broken tests, and one broken function. =)

---
 .../cuchaz/enigma/TestJarIndexInheritanceTree.java | 27 +++++++++++++++-------
 test/cuchaz/enigma/TestJarIndexLoneClass.java      | 10 ++++----
 2 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 04d4fb2..d3c23ea 100644
--- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -10,9 +10,19 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.TestEntryFactory.*;
-import static org.hamcrest.MatcherAssert.*;
-import static org.hamcrest.Matchers.*;
+import static cuchaz.enigma.TestEntryFactory.newBehaviorReferenceByConstructor;
+import static cuchaz.enigma.TestEntryFactory.newBehaviorReferenceByMethod;
+import static cuchaz.enigma.TestEntryFactory.newClass;
+import static cuchaz.enigma.TestEntryFactory.newConstructor;
+import static cuchaz.enigma.TestEntryFactory.newField;
+import static cuchaz.enigma.TestEntryFactory.newFieldReferenceByConstructor;
+import static cuchaz.enigma.TestEntryFactory.newFieldReferenceByMethod;
+import static cuchaz.enigma.TestEntryFactory.newMethod;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
 
 import java.util.Collection;
 import java.util.Set;
@@ -33,6 +43,7 @@ public class TestJarIndexInheritanceTree {
 	
 	private JarIndex m_index;
 	
+	private ClassEntry m_objectClass = newClass("java/lang/Object");
 	private ClassEntry m_baseClass = newClass("none/a");
 	private ClassEntry m_subClassA = newClass("none/b");
 	private ClassEntry m_subClassAA = newClass("none/d");
@@ -63,8 +74,8 @@ public class TestJarIndexInheritanceTree {
 		TranslationIndex index = m_index.getTranslationIndex();
 		
 		// base class
-		assertThat(index.getSuperclass(m_baseClass), is(nullValue()));
-		assertThat(index.getAncestry(m_baseClass), is(empty()));
+		assertThat(index.getSuperclass(m_baseClass), is(m_objectClass));
+		assertThat(index.getAncestry(m_baseClass), contains(m_objectClass));
 		assertThat(index.getSubclass(m_baseClass), containsInAnyOrder(
 			m_subClassA,
 			m_subClassB
@@ -72,17 +83,17 @@ public class TestJarIndexInheritanceTree {
 		
 		// subclass a
 		assertThat(index.getSuperclass(m_subClassA), is(m_baseClass));
-		assertThat(index.getAncestry(m_subClassA), contains(m_baseClass));
+		assertThat(index.getAncestry(m_subClassA), contains(m_baseClass, m_objectClass));
 		assertThat(index.getSubclass(m_subClassA), contains(m_subClassAA));
 		
 		// subclass aa
 		assertThat(index.getSuperclass(m_subClassAA), is(m_subClassA));
-		assertThat(index.getAncestry(m_subClassAA), contains(m_subClassA, m_baseClass));
+		assertThat(index.getAncestry(m_subClassAA), contains(m_subClassA, m_baseClass, m_objectClass));
 		assertThat(index.getSubclass(m_subClassAA), is(empty()));
 		
 		// subclass b
 		assertThat(index.getSuperclass(m_subClassB), is(m_baseClass));
-		assertThat(index.getAncestry(m_subClassB), contains(m_baseClass));
+		assertThat(index.getAncestry(m_subClassB), contains(m_baseClass, m_objectClass));
 		assertThat(index.getSubclass(m_subClassB), is(empty()));
 	}
 	
diff --git a/test/cuchaz/enigma/TestJarIndexLoneClass.java b/test/cuchaz/enigma/TestJarIndexLoneClass.java
index 2889241..c97b2ef 100644
--- a/test/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/test/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -52,10 +52,10 @@ public class TestJarIndexLoneClass {
 	
 	@Test
 	public void translationIndex() {
-		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().getSuperclass(new ClassEntry("none/a")), is(new ClassEntry("java/lang/Object")));
+		assertThat(m_index.getTranslationIndex().getSuperclass(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(new ClassEntry("java/lang/Object")));
+		assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("none/a")), contains(new ClassEntry("java/lang/Object")));
+		assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("cuchaz/enigma/inputs/Keep")), contains(new ClassEntry("java/lang/Object")));
 		assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("none/a")), is(empty()));
 		assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(empty()));
 	}
@@ -152,7 +152,7 @@ public class TestJarIndexLoneClass {
 	}
 	
 	@Test
-	public void contains() {
+	public void testContains() {
 		assertThat(m_index.containsObfClass(newClass("none/a")), is(true));
 		assertThat(m_index.containsObfClass(newClass("none/b")), is(false));
 		assertThat(m_index.containsObfField(newField("none/a", "a", "Ljava/lang/String;")), is(true));
-- 
cgit v1.2.3