From 818716acb3992e602e01725b6e151c1eb0f6c2e2 Mon Sep 17 00:00:00 2001 From: jeff Date: Thu, 5 Feb 2015 23:52:55 -0500 Subject: fix test code formatting and disable the super duper slow test for now --- test/cuchaz/enigma/TestDeobfuscator.java | 12 ++++++++---- test/cuchaz/enigma/TestInnerClasses.java | 3 ++- test/cuchaz/enigma/TestJarIndexConstructorReferences.java | 3 ++- test/cuchaz/enigma/TestJarIndexInheritanceTree.java | 3 ++- test/cuchaz/enigma/TestJarIndexLoneClass.java | 3 ++- test/cuchaz/enigma/TestSourceIndex.java | 5 +++-- test/cuchaz/enigma/TestTokensConstructors.java | 3 ++- test/cuchaz/enigma/TokenChecker.java | 3 ++- 8 files changed, 23 insertions(+), 12 deletions(-) (limited to 'test') 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; public class TestDeobfuscator { - private Deobfuscator getDeobfuscator() throws IOException { + private Deobfuscator getDeobfuscator() + throws IOException { return new Deobfuscator(new JarFile("build/testLoneClass.obf.jar")); } @Test - public void loadJar() throws Exception { + public void loadJar() + throws Exception { getDeobfuscator(); } @Test - public void getClasses() throws Exception { + public void getClasses() + throws Exception { Deobfuscator deobfuscator = getDeobfuscator(); List obfClasses = Lists.newArrayList(); List deobfClasses = Lists.newArrayList(); @@ -47,7 +50,8 @@ public class TestDeobfuscator { } @Test - public void decompileClass() throws Exception { + public void decompileClass() + throws Exception { Deobfuscator deobfuscator = getDeobfuscator(); deobfuscator.getSource(deobfuscator.getSourceTree("none/a")); } 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 { private static final String AnonymousWithOuterAccessOuter = "none/i"; private static final String AnonymousWithOuterAccessInner = "j"; - public TestInnerClasses() throws Exception { + public TestInnerClasses() + throws Exception { m_index = new JarIndex(); JarFile jar = new JarFile("build/testInnerClasses.obf.jar"); 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 { private ClassEntry m_defaultClass = new ClassEntry("none/c"); private ClassEntry m_callerClass = new ClassEntry("none/b"); - public TestJarIndexConstructorReferences() throws Exception { + public TestJarIndexConstructorReferences() + throws Exception { File jarFile = new File("build/testConstructors.obf.jar"); m_index = new JarIndex(); 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 { private FieldEntry m_nameField = new FieldEntry(m_baseClass, "a"); private FieldEntry m_numThingsField = new FieldEntry(m_subClassB, "a"); - public TestJarIndexInheritanceTree() throws Exception { + public TestJarIndexInheritanceTree() + throws Exception { m_index = new JarIndex(); m_index.indexJar(new JarFile("build/testInheritanceTree.obf.jar"), false); } 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 { private JarIndex m_index; - public TestJarIndexLoneClass() throws Exception { + public TestJarIndexLoneClass() + throws Exception { m_index = new JarIndex(); m_index.indexJar(new JarFile("build/testLoneClass.obf.jar"), false); } 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; public class TestSourceIndex { // TEMP - @Test - public void indexEverything() throws Exception { + //@Test + public void indexEverything() + throws Exception { Deobfuscator deobfuscator = new Deobfuscator(new JarFile("input/1.8.jar")); // 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; public class TestTokensConstructors extends TokenChecker { - public TestTokensConstructors() throws Exception { + public TestTokensConstructors() + throws Exception { super(new JarFile("build/testConstructors.obf.jar")); } 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 { private Deobfuscator m_deobfuscator; - protected TokenChecker(JarFile jarFile) throws IOException { + protected TokenChecker(JarFile jarFile) + throws IOException { m_deobfuscator = new Deobfuscator(jarFile); } -- cgit v1.2.3