From 4479acf3df4faf9daac93a396f5bba7cddb0759b Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 25 Feb 2015 00:12:04 -0500 Subject: more work getting inner class trees working in obf'd and deobf'd land --- test/cuchaz/enigma/TestJarIndexDeobfed.java | 52 ++++++++++++++++++++++ .../enigma/inputs/translation/M_NamelessClass.java | 10 +++-- 2 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 test/cuchaz/enigma/TestJarIndexDeobfed.java (limited to 'test') diff --git a/test/cuchaz/enigma/TestJarIndexDeobfed.java b/test/cuchaz/enigma/TestJarIndexDeobfed.java new file mode 100644 index 00000000..f776e4f6 --- /dev/null +++ b/test/cuchaz/enigma/TestJarIndexDeobfed.java @@ -0,0 +1,52 @@ +package cuchaz.enigma; + + +import static cuchaz.enigma.TestEntryFactory.*; +import static org.hamcrest.MatcherAssert.*; +import static org.hamcrest.Matchers.*; + +import java.util.jar.JarFile; + +import org.junit.BeforeClass; +import org.junit.Test; + +import cuchaz.enigma.analysis.JarIndex; + + +public class TestJarIndexDeobfed { + + private static JarIndex m_index; + + @BeforeClass + public static void beforeClass() + throws Exception { + m_index = new JarIndex(); + m_index.indexJar(new JarFile("build/testTranslation.deobf.jar"), true); + } + + @Test + public void obfEntries() { + assertThat(m_index.getObfClassEntries(), containsInAnyOrder( + newClass("cuchaz/enigma/inputs/Keep"), + newClass("none/a"), + newClass("none/b"), + newClass("none/c"), + newClass("none/d"), + newClass("none/d$e"), + newClass("none/f"), + newClass("none/g"), + newClass("none/h"), + newClass("none/h$i"), + newClass("none/h$i$j"), + newClass("none/h$k"), + newClass("none/h$k$l"), + newClass("none/m"), + newClass("none/m$n"), + newClass("none/m$n$o"), + newClass("none/m$p"), + newClass("none/m$p$q"), + newClass("none/m$p$q$r"), + newClass("none/m$p$q$s") + )); + } +} diff --git a/test/cuchaz/enigma/inputs/translation/M_NamelessClass.java b/test/cuchaz/enigma/inputs/translation/M_NamelessClass.java index afc9a9a5..5d8acbc7 100644 --- a/test/cuchaz/enigma/inputs/translation/M_NamelessClass.java +++ b/test/cuchaz/enigma/inputs/translation/M_NamelessClass.java @@ -3,14 +3,14 @@ package cuchaz.enigma.inputs.translation; public class M_NamelessClass { - public class I_InnerClass { + public class N_InnerClass { public int f1; public String f2; public void m1() {} - public class J_InnerInnerClass { + public class O_InnerInnerClass { public int f3; @@ -18,9 +18,11 @@ public class M_NamelessClass { } } - public class K_NamelessClass { - public class L_NamedInnerClass { + public class P_NamelessClass { + public class Q_NamedInnerClass { public int f4; + public class R_AnotherInnerClass {} + public class S_YetAnotherInnerClass {} } } } -- cgit v1.2.3