fix translation issues, particularly with fields

12 files changed, 154 insertions, 32 deletions

diff --git a/test/cuchaz/enigma/EntryFactory.java b/test/cuchaz/enigma/TestEntryFactory.java
index 8c94bdf..754f308 100644
--- a/test/cuchaz/enigma/EntryFactory.java
+++ b/test/cuchaz/enigma/TestEntryFactory.java
@@ -20,7 +20,7 @@ import cuchaz.enigma.mapping.MethodEntry;
 import cuchaz.enigma.mapping.Signature;
 import cuchaz.enigma.mapping.Type;
 
-public class EntryFactory {
+public class TestEntryFactory {
         
         public static ClassEntry newClass(String name) {
                 return new ClassEntry(name);
diff --git a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
index 22812fe..e1a3022 100644
--- a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
@@ -10,7 +10,7 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.*;
+import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 349d33b..6e2c1ad 100644
--- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -10,7 +10,7 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.*;
+import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
diff --git a/test/cuchaz/enigma/TestJarIndexLoneClass.java b/test/cuchaz/enigma/TestJarIndexLoneClass.java
index c0ac8d7..768284f 100644
--- a/test/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/test/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -11,7 +11,7 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.*;
+import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
@@ -96,8 +96,7 @@ public class TestJarIndexLoneClass {
         @Test
         public void methodImplementations() {
                 MethodEntry source = newMethod("none/a", "a", "()Ljava/lang/String;");
-                MethodImplementationsTreeNode node = m_index.getMethodImplementations(new Translator(), source);
-                assertThat(node, is(nullValue()));
+                assertThat(m_index.getMethodImplementations(new Translator(), source), is(empty()));
         }
         
         @Test
diff --git a/test/cuchaz/enigma/TestTokensConstructors.java b/test/cuchaz/enigma/TestTokensConstructors.java
index 6758d2a..a563f83 100644
--- a/test/cuchaz/enigma/TestTokensConstructors.java
+++ b/test/cuchaz/enigma/TestTokensConstructors.java
@@ -10,7 +10,7 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.*;
+import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
diff --git a/test/cuchaz/enigma/TestTranslator.java b/test/cuchaz/enigma/TestTranslator.java
index f91c585..3fe1680 100644
--- a/test/cuchaz/enigma/TestTranslator.java
+++ b/test/cuchaz/enigma/TestTranslator.java
@@ -1,6 +1,6 @@
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.*;
+import static cuchaz.enigma.TestEntryFactory.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.Matchers.*;
 
@@ -8,8 +8,10 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.jar.JarFile;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
+import cuchaz.enigma.mapping.Entry;
 import cuchaz.enigma.mapping.Mappings;
 import cuchaz.enigma.mapping.MappingsReader;
 import cuchaz.enigma.mapping.TranslationDirection;
@@ -18,25 +20,85 @@ import cuchaz.enigma.mapping.Translator;
 
 public class TestTranslator {
 
-        private Deobfuscator m_deobfuscator;
-        private Mappings m_mappings;
+        private static Deobfuscator m_deobfuscator;
+        private static Mappings m_mappings;
+        private static Translator m_deobfTranslator;
+        private static Translator m_obfTranslator;
         
-        public TestTranslator()
+        @BeforeClass
+        public static void beforeClass()
         throws Exception {
                 m_deobfuscator = new Deobfuscator(new JarFile("build/testTranslation.obf.jar"));
-                try (InputStream in = getClass().getResourceAsStream("/cuchaz/enigma/resources/translation.mappings")) {
+                try (InputStream in = TestTranslator.class.getResourceAsStream("/cuchaz/enigma/resources/translation.mappings")) {
                         m_mappings = new MappingsReader().read(new InputStreamReader(in));
                         m_deobfuscator.setMappings(m_mappings);
+                        m_deobfTranslator = m_deobfuscator.getTranslator(TranslationDirection.Deobfuscating);
+                        m_obfTranslator = m_deobfuscator.getTranslator(TranslationDirection.Obfuscating);
                 }
         }
         
         @Test
-        public void deobfuscatingTranslations()
-        throws Exception {
-                Translator translator = m_deobfuscator.getTranslator(TranslationDirection.Deobfuscating);
-                assertThat(translator.translateEntry(newClass("none/a")), is(newClass("deobf/A")));
-                assertThat(translator.translateEntry(newField("none/a", "a", "I")), is(newField("deobf/A", "one", "I")));
-                assertThat(translator.translateEntry(newField("none/a", "a", "F")), is(newField("deobf/A", "two", "F")));
-                assertThat(translator.translateEntry(newField("none/a", "a", "Ljava/lang/String;")), is(newField("deobf/A", "three", "Ljava/lang/String;")));
+        public void basicClasses() {
+                assertMapping(newClass("none/a"), newClass("deobf/A_Basic"));
+                assertMapping(newClass("none/b"), newClass("deobf/B_BaseClass"));
+                assertMapping(newClass("none/c"), newClass("deobf/C_SubClass"));
+        }
+
+        @Test
+        public void basicFields() {
+                assertMapping(newField("none/a", "a", "I"), newField("deobf/A_Basic", "f1", "I"));
+                assertMapping(newField("none/a", "a", "F"), newField("deobf/A_Basic", "f2", "F"));
+                assertMapping(newField("none/a", "a", "Ljava/lang/String;"), newField("deobf/A_Basic", "f3", "Ljava/lang/String;"));
+        }
+        
+        @Test
+        public void basicMethods() {
+                assertMapping(newMethod("none/a", "a", "()V"), newMethod("deobf/A_Basic", "m1", "()V"));
+                assertMapping(newMethod("none/a", "a", "()I"), newMethod("deobf/A_Basic", "m2", "()I"));
+                assertMapping(newMethod("none/a", "a", "(I)V"), newMethod("deobf/A_Basic", "m3", "(I)V"));
+                assertMapping(newMethod("none/a", "a", "(I)I"), newMethod("deobf/A_Basic", "m4", "(I)I"));
+        }
+        
+        // TODO: basic constructors
+        
+        @Test
+        public void inheritanceFields() {
+                assertMapping(newField("none/b", "a", "I"), newField("deobf/B_BaseClass", "f1", "I"));
+                assertMapping(newField("none/b", "a", "C"), newField("deobf/B_BaseClass", "f2", "C"));
+                assertMapping(newField("none/c", "b", "I"), newField("deobf/C_SubClass", "f3", "I"));
+                assertMapping(newField("none/c", "c", "I"), newField("deobf/C_SubClass", "f4", "I"));
+        }
+        
+        @Test
+        public void inheritanceFieldsShadowing() {
+                assertMapping(newField("none/c", "b", "C"), newField("deobf/C_SubClass", "f2", "C"));
+        }
+        
+        @Test
+        public void inheritanceFieldsBySubClass() {
+                assertMapping(newField("none/c", "a", "I"), newField("deobf/C_SubClass", "f1", "I"));
+                // NOTE: can't reference b.C by subclass since it's shadowed
+        }
+        
+        @Test
+        public void inheritanceMethods() {
+                assertMapping(newMethod("none/b", "a", "()I"), newMethod("deobf/B_BaseClass", "m1", "()I"));
+                assertMapping(newMethod("none/b", "b", "()I"), newMethod("deobf/B_BaseClass", "m2", "()I"));
+                assertMapping(newMethod("none/c", "c", "()I"), newMethod("deobf/C_SubClass", "m3", "()I"));
+        }
+        
+        @Test
+        public void inheritanceMethodsOverrides() {
+                assertMapping(newMethod("none/c", "a", "()I"), newMethod("deobf/C_SubClass", "m1", "()I"));
+        }
+        
+        @Test
+        public void inheritanceMethodsBySubClass() {
+                assertMapping(newMethod("none/c", "b", "()I"), newMethod("deobf/C_SubClass", "m2", "()I"));
+        }
+        
+        private void assertMapping(Entry obf, Entry deobf) {
+                assertThat(m_deobfTranslator.translateEntry(obf), is(deobf));
+                assertThat(m_obfTranslator.translateEntry(deobf), is(obf));
         }
 }
diff --git a/test/cuchaz/enigma/TestType.java b/test/cuchaz/enigma/TestType.java
index 7c3cebe..93f864b 100644
--- a/test/cuchaz/enigma/TestType.java
+++ b/test/cuchaz/enigma/TestType.java
@@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.*;
 
 import cuchaz.enigma.mapping.Type;
 
-import static cuchaz.enigma.EntryFactory.*;
+import static cuchaz.enigma.TestEntryFactory.*;
 
 
 public class TestType {
diff --git a/test/cuchaz/enigma/inputs/translation/A.java b/test/cuchaz/enigma/inputs/translation/A.java
deleted file mode 100644
index b8aaf11..0000000
--- a/test/cuchaz/enigma/inputs/translation/A.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cuchaz.enigma.inputs.translation;
-
-public class A {
-        
-        public int one;
-        public float two;
-        public String three;
-}
diff --git a/test/cuchaz/enigma/inputs/translation/A_Basic.java b/test/cuchaz/enigma/inputs/translation/A_Basic.java
new file mode 100644
index 0000000..8930763
--- /dev/null
+++ b/test/cuchaz/enigma/inputs/translation/A_Basic.java
@@ -0,0 +1,22 @@
+package cuchaz.enigma.inputs.translation;
+
+public class A_Basic {
+        
+        public int one;
+        public float two;
+        public String three;
+        
+        public void m1() {
+        }
+        
+        public int m2() {
+                return 42;
+        }
+        
+        public void m3(int a1) {
+        }
+        
+        public int m4(int a1) {
+                return 5; // chosen by fair die roll, guaranteed to be random
+        }
+}
diff --git a/test/cuchaz/enigma/inputs/translation/B_BaseClass.java b/test/cuchaz/enigma/inputs/translation/B_BaseClass.java
new file mode 100644
index 0000000..44fbc8d
--- /dev/null
+++ b/test/cuchaz/enigma/inputs/translation/B_BaseClass.java
@@ -0,0 +1,15 @@
+package cuchaz.enigma.inputs.translation;
+
+public class B_BaseClass {
+        
+        public int f1;
+        public char f2;
+        
+        public int m1() {
+                return 5;
+        }
+        
+        public int m2() {
+                return 42;
+        }
+}
diff --git a/test/cuchaz/enigma/inputs/translation/C_SubClass.java b/test/cuchaz/enigma/inputs/translation/C_SubClass.java
new file mode 100644
index 0000000..8fe0b79
--- /dev/null
+++ b/test/cuchaz/enigma/inputs/translation/C_SubClass.java
@@ -0,0 +1,17 @@
+package cuchaz.enigma.inputs.translation;
+
+public class C_SubClass extends B_BaseClass {
+        
+        public char f2; // shadows B_BaseClass.f2
+        public int f3;
+        public int f4;
+        
+        @Override
+        public int m1() {
+                return 32;
+        }
+        
+        public int m3() {
+                return 7;
+        }
+}
diff --git a/test/cuchaz/enigma/resources/translation.mappings b/test/cuchaz/enigma/resources/translation.mappings
index c71493e..d87d437 100644
--- a/test/cuchaz/enigma/resources/translation.mappings
+++ b/test/cuchaz/enigma/resources/translation.mappings
@@ -1,4 +1,19 @@
-CLASS none/a deobf/A
-        FIELD a one I
-        FIELD a two F
-        FIELD a three Ljava/lang/String;
\ No newline at end of file
+CLASS none/a deobf/A_Basic
+        FIELD a f1 I
+        FIELD a f2 F
+        FIELD a f3 Ljava/lang/String;
+        METHOD a m1 ()V
+        METHOD a m2 ()I
+        METHOD a m3 (I)V
+        METHOD a m4 (I)I
+CLASS none/b deobf/B_BaseClass
+        FIELD a f1 I
+        FIELD a f2 C
+        METHOD a m1 ()I
+        METHOD b m2 ()I
+CLASS none/c deobf/C_SubClass
+        FIELD b f2 C
+        FIELD b f3 I
+        FIELD c f4 I
+        METHOD a m1 ()I
+        METHOD c m3 ()I