From 64c359d3c1d2347001e5c6becb1d7561457f52cc Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 18:04:57 +1000 Subject: Renamed Fields --- src/test/java/cuchaz/enigma/TestTranslator.java | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/test') diff --git a/src/test/java/cuchaz/enigma/TestTranslator.java b/src/test/java/cuchaz/enigma/TestTranslator.java index 9b7f0931..dcdced01 100644 --- a/src/test/java/cuchaz/enigma/TestTranslator.java +++ b/src/test/java/cuchaz/enigma/TestTranslator.java @@ -4,7 +4,7 @@ * are made available under the terms of the GNU Lesser General Public * License v3.0 which accompanies this distribution, and is available at * http://www.gnu.org/licenses/lgpl.html - * + * * Contributors: * Jeff Martin - initial API and implementation ******************************************************************************/ @@ -34,7 +34,7 @@ public class TestTranslator { private static Mappings m_mappings; private static Translator m_deobfTranslator; private static Translator m_obfTranslator; - + @BeforeClass public static void beforeClass() throws Exception { @@ -47,7 +47,7 @@ public class TestTranslator { // m_obfTranslator = m_deobfuscator.getTranslator(TranslationDirection.Obfuscating); //} } - + @Test public void basicClasses() { assertMapping(newClass("none/a"), newClass("deobf/A_Basic")); @@ -61,7 +61,7 @@ public class TestTranslator { 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")); @@ -69,9 +69,9 @@ public class TestTranslator { 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")); @@ -79,69 +79,69 @@ public class TestTranslator { 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")); } - + @Test public void innerClasses() { - + // classes assertMapping(newClass("none/g"), newClass("deobf/G_OuterClass")); assertMapping(newClass("none/g$a"), newClass("deobf/G_OuterClass$A_InnerClass")); assertMapping(newClass("none/g$a$a"), newClass("deobf/G_OuterClass$A_InnerClass$A_InnerInnerClass")); assertMapping(newClass("none/g$b"), newClass("deobf/G_OuterClass$b")); assertMapping(newClass("none/g$b$a"), newClass("deobf/G_OuterClass$b$A_NamedInnerClass")); - + // fields assertMapping(newField("none/g$a", "a", "I"), newField("deobf/G_OuterClass$A_InnerClass", "f1", "I")); assertMapping(newField("none/g$a", "a", "Ljava/lang/String;"), newField("deobf/G_OuterClass$A_InnerClass", "f2", "Ljava/lang/String;")); assertMapping(newField("none/g$a$a", "a", "I"), newField("deobf/G_OuterClass$A_InnerClass$A_InnerInnerClass", "f3", "I")); assertMapping(newField("none/g$b$a", "a", "I"), newField("deobf/G_OuterClass$b$A_NamedInnerClass", "f4", "I")); - + // methods assertMapping(newMethod("none/g$a", "a", "()V"), newMethod("deobf/G_OuterClass$A_InnerClass", "m1", "()V")); assertMapping(newMethod("none/g$a$a", "a", "()V"), newMethod("deobf/G_OuterClass$A_InnerClass$A_InnerInnerClass", "m2", "()V")); } - + @Test public void namelessClass() { assertMapping(newClass("none/h"), newClass("none/h")); } - + @Test public void testGenerics() { - + // classes assertMapping(newClass("none/i"), newClass("deobf/I_Generics")); assertMapping(newClass("none/i$a"), newClass("deobf/I_Generics$A_Type")); assertMapping(newClass("none/i$b"), newClass("deobf/I_Generics$B_Generic")); - + // fields assertMapping(newField("none/i", "a", "Ljava/util/List;"), newField("deobf/I_Generics", "f1", "Ljava/util/List;")); assertMapping(newField("none/i", "b", "Ljava/util/List;"), newField("deobf/I_Generics", "f2", "Ljava/util/List;")); @@ -149,20 +149,20 @@ public class TestTranslator { assertMapping(newField("none/i$b", "a", "Ljava/lang/Object;"), newField("deobf/I_Generics$B_Generic", "f4", "Ljava/lang/Object;")); assertMapping(newField("none/i", "a", "Lnone/i$b;"), newField("deobf/I_Generics", "f5", "Ldeobf/I_Generics$B_Generic;")); assertMapping(newField("none/i", "b", "Lnone/i$b;"), newField("deobf/I_Generics", "f6", "Ldeobf/I_Generics$B_Generic;")); - + // methods assertMapping(newMethod("none/i$b", "a", "()Ljava/lang/Object;"), newMethod("deobf/I_Generics$B_Generic", "m1", "()Ljava/lang/Object;")); } - + private void assertMapping(Entry obf, Entry deobf) { //assertThat(m_deobfTranslator.translateEntry(obf), is(deobf)); //assertThat(m_obfTranslator.translateEntry(deobf), is(obf)); - + //String deobfName = m_deobfTranslator.translate(obf); //if (deobfName != null) { // assertThat(deobfName, is(deobf.getName())); //} - + //String obfName = m_obfTranslator.translate(deobf); //if (obfName != null) { // assertThat(obfName, is(obf.getName())); -- cgit v1.2.3