diff options
| author | 2015-02-05 23:52:55 -0500 | |
|---|---|---|
| committer | 2015-02-05 23:52:55 -0500 | |
| commit | 818716acb3992e602e01725b6e151c1eb0f6c2e2 (patch) | |
| tree | 3d2b09beaffbd995c5a9aba8a321d487d7a9b635 | |
| parent | add new type/signature system (diff) | |
| download | enigma-fork-818716acb3992e602e01725b6e151c1eb0f6c2e2.tar.gz enigma-fork-818716acb3992e602e01725b6e151c1eb0f6c2e2.tar.xz enigma-fork-818716acb3992e602e01725b6e151c1eb0f6c2e2.zip | |
fix test code formatting
and disable the super duper slow test for now
| -rw-r--r-- | test/cuchaz/enigma/TestDeobfuscator.java | 12 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TestInnerClasses.java | 3 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TestJarIndexConstructorReferences.java | 3 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TestJarIndexInheritanceTree.java | 3 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TestJarIndexLoneClass.java | 3 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TestSourceIndex.java | 5 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TestTokensConstructors.java | 3 | ||||
| -rw-r--r-- | test/cuchaz/enigma/TokenChecker.java | 3 |
8 files changed, 23 insertions, 12 deletions
diff --git a/test/cuchaz/enigma/TestDeobfuscator.java b/test/cuchaz/enigma/TestDeobfuscator.java index 129d7b2..26d492d 100644 --- a/test/cuchaz/enigma/TestDeobfuscator.java +++ b/test/cuchaz/enigma/TestDeobfuscator.java | |||
| @@ -25,17 +25,20 @@ import cuchaz.enigma.mapping.ClassEntry; | |||
| 25 | 25 | ||
| 26 | public class TestDeobfuscator { | 26 | public class TestDeobfuscator { |
| 27 | 27 | ||
| 28 | private Deobfuscator getDeobfuscator() throws IOException { | 28 | private Deobfuscator getDeobfuscator() |
| 29 | throws IOException { | ||
| 29 | return new Deobfuscator(new JarFile("build/testLoneClass.obf.jar")); | 30 | return new Deobfuscator(new JarFile("build/testLoneClass.obf.jar")); |
| 30 | } | 31 | } |
| 31 | 32 | ||
| 32 | @Test | 33 | @Test |
| 33 | public void loadJar() throws Exception { | 34 | public void loadJar() |
| 35 | throws Exception { | ||
| 34 | getDeobfuscator(); | 36 | getDeobfuscator(); |
| 35 | } | 37 | } |
| 36 | 38 | ||
| 37 | @Test | 39 | @Test |
| 38 | public void getClasses() throws Exception { | 40 | public void getClasses() |
| 41 | throws Exception { | ||
| 39 | Deobfuscator deobfuscator = getDeobfuscator(); | 42 | Deobfuscator deobfuscator = getDeobfuscator(); |
| 40 | List<ClassEntry> obfClasses = Lists.newArrayList(); | 43 | List<ClassEntry> obfClasses = Lists.newArrayList(); |
| 41 | List<ClassEntry> deobfClasses = Lists.newArrayList(); | 44 | List<ClassEntry> deobfClasses = Lists.newArrayList(); |
| @@ -47,7 +50,8 @@ public class TestDeobfuscator { | |||
| 47 | } | 50 | } |
| 48 | 51 | ||
| 49 | @Test | 52 | @Test |
| 50 | public void decompileClass() throws Exception { | 53 | public void decompileClass() |
| 54 | throws Exception { | ||
| 51 | Deobfuscator deobfuscator = getDeobfuscator(); | 55 | Deobfuscator deobfuscator = getDeobfuscator(); |
| 52 | deobfuscator.getSource(deobfuscator.getSourceTree("none/a")); | 56 | deobfuscator.getSource(deobfuscator.getSourceTree("none/a")); |
| 53 | } | 57 | } |
diff --git a/test/cuchaz/enigma/TestInnerClasses.java b/test/cuchaz/enigma/TestInnerClasses.java index 63c9b71..2e16a33 100644 --- a/test/cuchaz/enigma/TestInnerClasses.java +++ b/test/cuchaz/enigma/TestInnerClasses.java | |||
| @@ -36,7 +36,8 @@ public class TestInnerClasses { | |||
| 36 | private static final String AnonymousWithOuterAccessOuter = "none/i"; | 36 | private static final String AnonymousWithOuterAccessOuter = "none/i"; |
| 37 | private static final String AnonymousWithOuterAccessInner = "j"; | 37 | private static final String AnonymousWithOuterAccessInner = "j"; |
| 38 | 38 | ||
| 39 | public TestInnerClasses() throws Exception { | 39 | public TestInnerClasses() |
| 40 | throws Exception { | ||
| 40 | m_index = new JarIndex(); | 41 | m_index = new JarIndex(); |
| 41 | JarFile jar = new JarFile("build/testInnerClasses.obf.jar"); | 42 | JarFile jar = new JarFile("build/testInnerClasses.obf.jar"); |
| 42 | m_index.indexJar(jar, true); | 43 | m_index.indexJar(jar, true); |
diff --git a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java index 8e3ad6d..a735de7 100644 --- a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java +++ b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java | |||
| @@ -36,7 +36,8 @@ public class TestJarIndexConstructorReferences { | |||
| 36 | private ClassEntry m_defaultClass = new ClassEntry("none/c"); | 36 | private ClassEntry m_defaultClass = new ClassEntry("none/c"); |
| 37 | private ClassEntry m_callerClass = new ClassEntry("none/b"); | 37 | private ClassEntry m_callerClass = new ClassEntry("none/b"); |
| 38 | 38 | ||
| 39 | public TestJarIndexConstructorReferences() throws Exception { | 39 | public TestJarIndexConstructorReferences() |
| 40 | throws Exception { | ||
| 40 | File jarFile = new File("build/testConstructors.obf.jar"); | 41 | File jarFile = new File("build/testConstructors.obf.jar"); |
| 41 | m_index = new JarIndex(); | 42 | m_index = new JarIndex(); |
| 42 | m_index.indexJar(new JarFile(jarFile), false); | 43 | m_index.indexJar(new JarFile(jarFile), false); |
diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java index 4d66397..26499f0 100644 --- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java +++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java | |||
| @@ -41,7 +41,8 @@ public class TestJarIndexInheritanceTree { | |||
| 41 | private FieldEntry m_nameField = new FieldEntry(m_baseClass, "a"); | 41 | private FieldEntry m_nameField = new FieldEntry(m_baseClass, "a"); |
| 42 | private FieldEntry m_numThingsField = new FieldEntry(m_subClassB, "a"); | 42 | private FieldEntry m_numThingsField = new FieldEntry(m_subClassB, "a"); |
| 43 | 43 | ||
| 44 | public TestJarIndexInheritanceTree() throws Exception { | 44 | public TestJarIndexInheritanceTree() |
| 45 | throws Exception { | ||
| 45 | m_index = new JarIndex(); | 46 | m_index = new JarIndex(); |
| 46 | m_index.indexJar(new JarFile("build/testInheritanceTree.obf.jar"), false); | 47 | m_index.indexJar(new JarFile("build/testInheritanceTree.obf.jar"), false); |
| 47 | } | 48 | } |
diff --git a/test/cuchaz/enigma/TestJarIndexLoneClass.java b/test/cuchaz/enigma/TestJarIndexLoneClass.java index a061b72..108c623 100644 --- a/test/cuchaz/enigma/TestJarIndexLoneClass.java +++ b/test/cuchaz/enigma/TestJarIndexLoneClass.java | |||
| @@ -38,7 +38,8 @@ public class TestJarIndexLoneClass { | |||
| 38 | 38 | ||
| 39 | private JarIndex m_index; | 39 | private JarIndex m_index; |
| 40 | 40 | ||
| 41 | public TestJarIndexLoneClass() throws Exception { | 41 | public TestJarIndexLoneClass() |
| 42 | throws Exception { | ||
| 42 | m_index = new JarIndex(); | 43 | m_index = new JarIndex(); |
| 43 | m_index.indexJar(new JarFile("build/testLoneClass.obf.jar"), false); | 44 | m_index.indexJar(new JarFile("build/testLoneClass.obf.jar"), false); |
| 44 | } | 45 | } |
diff --git a/test/cuchaz/enigma/TestSourceIndex.java b/test/cuchaz/enigma/TestSourceIndex.java index 70a5ee4..357acb6 100644 --- a/test/cuchaz/enigma/TestSourceIndex.java +++ b/test/cuchaz/enigma/TestSourceIndex.java | |||
| @@ -24,8 +24,9 @@ import cuchaz.enigma.mapping.ClassEntry; | |||
| 24 | public class TestSourceIndex { | 24 | public class TestSourceIndex { |
| 25 | 25 | ||
| 26 | // TEMP | 26 | // TEMP |
| 27 | @Test | 27 | //@Test |
| 28 | public void indexEverything() throws Exception { | 28 | public void indexEverything() |
| 29 | throws Exception { | ||
| 29 | Deobfuscator deobfuscator = new Deobfuscator(new JarFile("input/1.8.jar")); | 30 | Deobfuscator deobfuscator = new Deobfuscator(new JarFile("input/1.8.jar")); |
| 30 | 31 | ||
| 31 | // get all classes that aren't inner classes | 32 | // get all classes that aren't inner classes |
diff --git a/test/cuchaz/enigma/TestTokensConstructors.java b/test/cuchaz/enigma/TestTokensConstructors.java index 56424ae..6758d2a 100644 --- a/test/cuchaz/enigma/TestTokensConstructors.java +++ b/test/cuchaz/enigma/TestTokensConstructors.java | |||
| @@ -22,7 +22,8 @@ import cuchaz.enigma.mapping.BehaviorEntry; | |||
| 22 | 22 | ||
| 23 | public class TestTokensConstructors extends TokenChecker { | 23 | public class TestTokensConstructors extends TokenChecker { |
| 24 | 24 | ||
| 25 | public TestTokensConstructors() throws Exception { | 25 | public TestTokensConstructors() |
| 26 | throws Exception { | ||
| 26 | super(new JarFile("build/testConstructors.obf.jar")); | 27 | super(new JarFile("build/testConstructors.obf.jar")); |
| 27 | } | 28 | } |
| 28 | 29 | ||
diff --git a/test/cuchaz/enigma/TokenChecker.java b/test/cuchaz/enigma/TokenChecker.java index febea2a..a72c2fc 100644 --- a/test/cuchaz/enigma/TokenChecker.java +++ b/test/cuchaz/enigma/TokenChecker.java | |||
| @@ -27,7 +27,8 @@ public class TokenChecker { | |||
| 27 | 27 | ||
| 28 | private Deobfuscator m_deobfuscator; | 28 | private Deobfuscator m_deobfuscator; |
| 29 | 29 | ||
| 30 | protected TokenChecker(JarFile jarFile) throws IOException { | 30 | protected TokenChecker(JarFile jarFile) |
| 31 | throws IOException { | ||
| 31 | m_deobfuscator = new Deobfuscator(jarFile); | 32 | m_deobfuscator = new Deobfuscator(jarFile); |
| 32 | } | 33 | } |
| 33 | 34 | ||