From 31a1a418b04cd3e7b06cb50cb8674a2c25079f6c Mon Sep 17 00:00:00 2001 From: jeff Date: Sun, 8 Feb 2015 23:10:26 -0500 Subject: added types to fields --- test/cuchaz/enigma/EntryFactory.java | 9 +++++---- test/cuchaz/enigma/TestJarIndexInheritanceTree.java | 4 ++-- test/cuchaz/enigma/TestJarIndexLoneClass.java | 12 +++++++----- test/cuchaz/enigma/TestTranslator.java | 3 +++ test/cuchaz/enigma/resources/translation.mappings | 6 +++--- 5 files changed, 20 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/cuchaz/enigma/EntryFactory.java b/test/cuchaz/enigma/EntryFactory.java index fa90779d..8c94bdf3 100644 --- a/test/cuchaz/enigma/EntryFactory.java +++ b/test/cuchaz/enigma/EntryFactory.java @@ -18,6 +18,7 @@ import cuchaz.enigma.mapping.ConstructorEntry; import cuchaz.enigma.mapping.FieldEntry; import cuchaz.enigma.mapping.MethodEntry; import cuchaz.enigma.mapping.Signature; +import cuchaz.enigma.mapping.Type; public class EntryFactory { @@ -25,12 +26,12 @@ public class EntryFactory { return new ClassEntry(name); } - public static FieldEntry newField(String className, String fieldName) { - return newField(newClass(className), fieldName); + public static FieldEntry newField(String className, String fieldName, String fieldType) { + return newField(newClass(className), fieldName, fieldType); } - public static FieldEntry newField(ClassEntry classEntry, String fieldName) { - return new FieldEntry(classEntry, fieldName); + public static FieldEntry newField(ClassEntry classEntry, String fieldName, String fieldType) { + return new FieldEntry(classEntry, fieldName, new Type(fieldType)); } public static MethodEntry newMethod(String className, String methodName, String methodSignature) { diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java index 1d6e5a55..349d33b1 100644 --- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java +++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java @@ -37,8 +37,8 @@ public class TestJarIndexInheritanceTree { private ClassEntry m_subClassA = newClass("none/b"); private ClassEntry m_subClassAA = newClass("none/d"); private ClassEntry m_subClassB = newClass("none/c"); - private FieldEntry m_nameField = new FieldEntry(m_baseClass, "a"); - private FieldEntry m_numThingsField = new FieldEntry(m_subClassB, "a"); + private FieldEntry m_nameField = newField(m_baseClass, "a", "Ljava/lang/String;"); + private FieldEntry m_numThingsField = newField(m_subClassB, "a", "I"); public TestJarIndexInheritanceTree() throws Exception { diff --git a/test/cuchaz/enigma/TestJarIndexLoneClass.java b/test/cuchaz/enigma/TestJarIndexLoneClass.java index c6a9e550..c0ac8d7d 100644 --- a/test/cuchaz/enigma/TestJarIndexLoneClass.java +++ b/test/cuchaz/enigma/TestJarIndexLoneClass.java @@ -64,9 +64,10 @@ public class TestJarIndexLoneClass { @Test public void access() { - assertThat(m_index.getAccess(newField("none/a", "a")), is(Access.Private)); + assertThat(m_index.getAccess(newField("none/a", "a", "Ljava/lang/String;")), is(Access.Private)); assertThat(m_index.getAccess(newMethod("none/a", "a", "()Ljava/lang/String;")), is(Access.Public)); - assertThat(m_index.getAccess(newField("none/a", "b")), is(nullValue())); + assertThat(m_index.getAccess(newField("none/a", "b", "Ljava/lang/String;")), is(nullValue())); + assertThat(m_index.getAccess(newField("none/a", "a", "LFoo;")), is(nullValue())); } @Test @@ -110,7 +111,7 @@ public class TestJarIndexLoneClass { @Test @SuppressWarnings("unchecked") public void fieldReferences() { - FieldEntry source = newField("none/a", "a"); + FieldEntry source = newField("none/a", "a", "Ljava/lang/String;"); Collection> references = m_index.getFieldReferences(source); assertThat(references, containsInAnyOrder( newFieldReferenceByConstructor(source, "none/a", "(Ljava/lang/String;)V"), @@ -157,8 +158,9 @@ public class TestJarIndexLoneClass { public void contains() { 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")), is(true)); - assertThat(m_index.containsObfField(newField("none/a", "b")), is(false)); + assertThat(m_index.containsObfField(newField("none/a", "a", "Ljava/lang/String;")), is(true)); + assertThat(m_index.containsObfField(newField("none/a", "b", "Ljava/lang/String;")), is(false)); + assertThat(m_index.containsObfField(newField("none/a", "a", "LFoo;")), is(false)); assertThat(m_index.containsObfBehavior(newMethod("none/a", "a", "()Ljava/lang/String;")), is(true)); assertThat(m_index.containsObfBehavior(newMethod("none/a", "b", "()Ljava/lang/String;")), is(false)); } diff --git a/test/cuchaz/enigma/TestTranslator.java b/test/cuchaz/enigma/TestTranslator.java index 290f6f04..f91c5852 100644 --- a/test/cuchaz/enigma/TestTranslator.java +++ b/test/cuchaz/enigma/TestTranslator.java @@ -35,5 +35,8 @@ public class TestTranslator { 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;"))); } } diff --git a/test/cuchaz/enigma/resources/translation.mappings b/test/cuchaz/enigma/resources/translation.mappings index 70755bf6..c71493e9 100644 --- a/test/cuchaz/enigma/resources/translation.mappings +++ b/test/cuchaz/enigma/resources/translation.mappings @@ -1,4 +1,4 @@ CLASS none/a deobf/A - FIELD a one - FIELD b two - FIELD c three \ No newline at end of file + FIELD a one I + FIELD a two F + FIELD a three Ljava/lang/String; \ No newline at end of file -- cgit v1.2.3