started unit testing for inner/anonymous class detection

8 files changed, 122 insertions, 30 deletions

diff --git a/test/cuchaz/enigma/TestDeobfuscator.java b/test/cuchaz/enigma/TestDeobfuscator.java
index 3bb0c480..71de24ae 100644
--- a/test/cuchaz/enigma/TestDeobfuscator.java
+++ b/test/cuchaz/enigma/TestDeobfuscator.java
@@ -11,7 +11,7 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/test/cuchaz/enigma/TestInnerClasses.java b/test/cuchaz/enigma/TestInnerClasses.java
new file mode 100644
index 00000000..c6b1b5fb
--- /dev/null
+++ b/test/cuchaz/enigma/TestInnerClasses.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Jeff Martin.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.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;
+
+import org.junit.Test;
+
+import cuchaz.enigma.analysis.JarIndex;
+
+public class TestInnerClasses
+{
+        private JarIndex m_index;
+        
+        private static final String AnonymousOuter = "none/a";
+        private static final String AnonymousInner = "none/b";
+        private static final String SimpleOuter = "none/e";
+        private static final String SimpleInner = "none/f";
+        private static final String ConstructorArgsOuter = "none/c";
+        private static final String ConstructorArgsInner = "none/d";
+        
+        public TestInnerClasses( )
+        throws Exception
+        {
+                m_index = new JarIndex();
+                m_index.indexJar( new JarFile( "build/libs/testInnerClasses.obf.jar" ), true );
+        }
+        
+        @Test
+        public void simple( )
+        {
+                assertThat( m_index.getOuterClass( SimpleInner ), is( SimpleOuter ) );
+                assertThat( m_index.getInnerClasses( SimpleOuter ), containsInAnyOrder( SimpleInner ) );
+                assertThat( m_index.isAnonymousClass( SimpleInner ), is( false ) );
+        }
+        
+        @Test
+        public void anonymous( )
+        {
+                assertThat( m_index.getOuterClass( AnonymousInner ), is( AnonymousOuter ) );
+                assertThat( m_index.getInnerClasses( AnonymousOuter ), containsInAnyOrder( AnonymousInner ) );
+                assertThat( m_index.isAnonymousClass( AnonymousInner ), is( true ) );
+        }
+
+        @Test
+        public void constructorArgs( )
+        {
+                assertThat( m_index.getOuterClass( ConstructorArgsInner ), is( ConstructorArgsOuter ) );
+                assertThat( m_index.getInnerClasses( ConstructorArgsOuter ), containsInAnyOrder( ConstructorArgsInner ) );
+                assertThat( m_index.isAnonymousClass( ConstructorArgsInner ), is( false ) );
+        }
+}
diff --git a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
index c0691888..02381718 100644
--- a/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
+++ b/test/cuchaz/enigma/TestJarIndexConstructorReferences.java
@@ -10,13 +10,9 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.newBehaviorReferenceByConstructor;
-import static cuchaz.enigma.EntryFactory.newBehaviorReferenceByMethod;
-import static cuchaz.enigma.EntryFactory.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 cuchaz.enigma.EntryFactory.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 3d488ee4..317a6bc4 100644
--- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -10,17 +10,9 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.newBehaviorReferenceByConstructor;
-import static cuchaz.enigma.EntryFactory.newBehaviorReferenceByMethod;
-import static cuchaz.enigma.EntryFactory.newClass;
-import static cuchaz.enigma.EntryFactory.newFieldReferenceByConstructor;
-import static cuchaz.enigma.EntryFactory.newFieldReferenceByMethod;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
+import static cuchaz.enigma.EntryFactory.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/test/cuchaz/enigma/TestJarIndexLoneClass.java b/test/cuchaz/enigma/TestJarIndexLoneClass.java
index 9236d0c1..4c32b703 100644
--- a/test/cuchaz/enigma/TestJarIndexLoneClass.java
+++ b/test/cuchaz/enigma/TestJarIndexLoneClass.java
@@ -11,17 +11,9 @@
  ******************************************************************************/
 package cuchaz.enigma;
 
-import static cuchaz.enigma.EntryFactory.newClass;
-import static cuchaz.enigma.EntryFactory.newField;
-import static cuchaz.enigma.EntryFactory.newFieldReferenceByConstructor;
-import static cuchaz.enigma.EntryFactory.newFieldReferenceByMethod;
-import static cuchaz.enigma.EntryFactory.newMethod;
-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.not;
-import static org.hamcrest.Matchers.nullValue;
+import static cuchaz.enigma.EntryFactory.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
 
 import java.util.Collection;
 import java.util.Set;
diff --git a/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java b/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java
new file mode 100644
index 00000000..dbff5238
--- /dev/null
+++ b/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java
@@ -0,0 +1,17 @@
+package cuchaz.enigma.inputs.innerClasses;
+
+public class Anonymous // a
+{
+        public void foo( )
+        {
+                Runnable runnable = new Runnable( ) // b
+                {
+                        @Override
+                        public void run( )
+                        {
+                                // don't care
+                        }
+                };
+                runnable.run();
+        }
+}
diff --git a/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java b/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java
new file mode 100644
index 00000000..d12d9cf7
--- /dev/null
+++ b/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java
@@ -0,0 +1,22 @@
+package cuchaz.enigma.inputs.innerClasses;
+
+@SuppressWarnings( "unused" )
+public class ConstructorArgs // c
+{
+        class Inner // d
+        {
+                private int a;
+                
+                public Inner( int a )
+                {
+                        this.a = a;
+                }
+        }
+        
+        Inner i;
+        
+        public void foo( )
+        {
+                i = new Inner( 5 );
+        }
+}
diff --git a/test/cuchaz/enigma/inputs/innerClasses/Simple.java b/test/cuchaz/enigma/inputs/innerClasses/Simple.java
new file mode 100644
index 00000000..f2c08a73
--- /dev/null
+++ b/test/cuchaz/enigma/inputs/innerClasses/Simple.java
@@ -0,0 +1,9 @@
+package cuchaz.enigma.inputs.innerClasses;
+
+public class Simple // e
+{
+        class Inner // f
+        {
+                // nothing to do
+        }
+}