Follow Fabric guidelines

1 files changed, 27 insertions, 26 deletions

diff --git a/src/test/java/cuchaz/enigma/TestInnerClasses.java b/src/test/java/cuchaz/enigma/TestInnerClasses.java
index 64a695a..38db0df 100644
--- a/src/test/java/cuchaz/enigma/TestInnerClasses.java
+++ b/src/test/java/cuchaz/enigma/TestInnerClasses.java
@@ -4,29 +4,28 @@
  * 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
  ******************************************************************************/
-package cuchaz.enigma;
-
-import static org.hamcrest.MatcherAssert.*;
-import static org.hamcrest.Matchers.*;
 
-import java.util.jar.JarFile;
+package cuchaz.enigma;
 
+import cuchaz.enigma.analysis.JarIndex;
+import cuchaz.enigma.mapping.ClassEntry;
 import org.junit.Test;
 
-import static cuchaz.enigma.TestEntryFactory.*;
+import java.util.jar.JarFile;
 
-import cuchaz.enigma.analysis.JarIndex;
-import cuchaz.enigma.mapping.ClassEntry;
+import static cuchaz.enigma.TestEntryFactory.newClass;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
 
 public class TestInnerClasses {
-        
-        private JarIndex     index;
-        private Deobfuscator deobfuscator;
-        
+
         private static final ClassEntry AnonymousOuter = newClass("a");
         private static final ClassEntry AnonymousInner = newClass("a$1");
         private static final ClassEntry SimpleOuter = newClass("d");
@@ -41,15 +40,17 @@ public class TestInnerClasses {
         private static final ClassEntry ClassTreeLevel1 = newClass("f$a");
         private static final ClassEntry ClassTreeLevel2 = newClass("f$a$a");
         private static final ClassEntry ClassTreeLevel3 = newClass("f$a$a$a");
-        
+        private JarIndex index;
+        private Deobfuscator deobfuscator;
+
         public TestInnerClasses()
-        throws Exception {
+                throws Exception {
                 index = new JarIndex();
                 JarFile jar = new JarFile("build/test-obf/innerClasses.jar");
                 index.indexJar(jar, true);
                 deobfuscator = new Deobfuscator(jar);
         }
-        
+
         @Test
         public void simple() {
                 assertThat(index.getOuterClass(SimpleInner), is(SimpleOuter));
@@ -57,7 +58,7 @@ public class TestInnerClasses {
                 assertThat(index.isAnonymousClass(SimpleInner), is(false));
                 decompile(SimpleOuter);
         }
-        
+
         @Test
         public void anonymous() {
                 assertThat(index.getOuterClass(AnonymousInner), is(AnonymousOuter));
@@ -65,7 +66,7 @@ public class TestInnerClasses {
                 assertThat(index.isAnonymousClass(AnonymousInner), is(true));
                 decompile(AnonymousOuter);
         }
-        
+
         @Test
         public void constructorArgs() {
                 assertThat(index.getOuterClass(ConstructorArgsInner), is(ConstructorArgsOuter));
@@ -73,7 +74,7 @@ public class TestInnerClasses {
                 assertThat(index.isAnonymousClass(ConstructorArgsInner), is(false));
                 decompile(ConstructorArgsOuter);
         }
-        
+
         @Test
         public void anonymousWithScopeArgs() {
                 assertThat(index.getOuterClass(AnonymousWithScopeArgsInner), is(AnonymousWithScopeArgsOuter));
@@ -81,7 +82,7 @@ public class TestInnerClasses {
                 assertThat(index.isAnonymousClass(AnonymousWithScopeArgsInner), is(true));
                 decompile(AnonymousWithScopeArgsOuter);
         }
-        
+
         @Test
         public void anonymousWithOuterAccess() {
                 assertThat(index.getOuterClass(AnonymousWithOuterAccessInner), is(AnonymousWithOuterAccessOuter));
@@ -89,15 +90,15 @@ public class TestInnerClasses {
                 assertThat(index.isAnonymousClass(AnonymousWithOuterAccessInner), is(true));
                 decompile(AnonymousWithOuterAccessOuter);
         }
-        
+
         @Test
         public void classTree() {
-                
+
                 // root level
                 assertThat(index.containsObfClass(ClassTreeRoot), is(true));
                 assertThat(index.getOuterClass(ClassTreeRoot), is(nullValue()));
                 assertThat(index.getInnerClasses(ClassTreeRoot), containsInAnyOrder(ClassTreeLevel1));
-                
+
                 // level 1
                 ClassEntry fullClassEntry = new ClassEntry(ClassTreeRoot.getName()
                         + "$" + ClassTreeLevel1.getInnermostClassName()
@@ -105,7 +106,7 @@ public class TestInnerClasses {
                 assertThat(index.containsObfClass(fullClassEntry), is(true));
                 assertThat(index.getOuterClass(ClassTreeLevel1), is(ClassTreeRoot));
                 assertThat(index.getInnerClasses(ClassTreeLevel1), containsInAnyOrder(ClassTreeLevel2));
-                
+
                 // level 2
                 fullClassEntry = new ClassEntry(ClassTreeRoot.getName()
                         + "$" + ClassTreeLevel1.getInnermostClassName()
@@ -114,7 +115,7 @@ public class TestInnerClasses {
                 assertThat(index.containsObfClass(fullClassEntry), is(true));
                 assertThat(index.getOuterClass(ClassTreeLevel2), is(ClassTreeLevel1));
                 assertThat(index.getInnerClasses(ClassTreeLevel2), containsInAnyOrder(ClassTreeLevel3));
-                
+
                 // level 3
                 fullClassEntry = new ClassEntry(ClassTreeRoot.getName()
                         + "$" + ClassTreeLevel1.getInnermostClassName()
@@ -125,7 +126,7 @@ public class TestInnerClasses {
                 assertThat(index.getOuterClass(ClassTreeLevel3), is(ClassTreeLevel2));
                 assertThat(index.getInnerClasses(ClassTreeLevel3), is(empty()));
         }
-        
+
         private void decompile(ClassEntry classEntry) {
                 deobfuscator.getSourceTree(classEntry.getName());
         }