fixed bug with method references pointing to wrong class

5 files changed, 26 insertions, 2 deletions

diff --git a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
index 5ded5df0..3d488ee4 100644
--- a/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
+++ b/test/cuchaz/enigma/TestJarIndexInheritanceTree.java
@@ -220,7 +220,8 @@ public class TestJarIndexInheritanceTree
                 source = new MethodEntry( m_baseClass, "a", "()Ljava/lang/String;" );
                 references = m_index.getBehaviorReferences( source );
                 assertThat( references, containsInAnyOrder(
-                        newBehaviorReferenceByMethod( source, m_subClassAA.getName(), "a", "()Ljava/lang/String;" )
+                        newBehaviorReferenceByMethod( source, m_subClassAA.getName(), "a", "()Ljava/lang/String;" ),
+                        newBehaviorReferenceByMethod( source, m_subClassB.getName(), "a", "()V" )
                 ) );
                 
                 // subclassAA.getName()
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
index a6b38454..8402dde3 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java
@@ -1,18 +1,23 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/a
 public abstract class BaseClass
 {
+        // a
         private String m_name;
         
+        // <init>(Ljava/lang/String;)V
         protected BaseClass( String name )
         {
                 m_name = name;
         }
         
+        // a()Ljava/lang/String;
         public String getName( )
         {
                 return m_name;
         }
         
+        // a()V
         public abstract void doBaseThings( );
 }
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
index f4780a26..ed507093 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java
@@ -1,9 +1,12 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/b extends none/a
 public abstract class SubclassA extends BaseClass
 {
+        // <init>(Ljava/lang/String;)V
         protected SubclassA( String name )
         {
+                // call to none/a.<init>(Ljava/lang/String)V
                 super( name );
         }
 }
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
index 4001e7a3..fc4c8eed 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java
@@ -1,24 +1,33 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/c extends none/a
 public class SubclassB extends BaseClass
 {
+        // a
         private int m_numThings;
         
+        // <init>()V
         protected SubclassB( )
         {
+                // none/a.<init>(Ljava/lang/String;)V
                 super( "B" );
                 
+                // access to a
                 m_numThings = 4;
         }
         
         @Override
+        // a()V
         public void doBaseThings( )
         {
-                System.out.println( "Base things by B!" );
+                // call to none/a.a()Ljava/lang/String;
+                System.out.println( "Base things by B! " + getName() );
         }
         
+        // b()V
         public void doBThings( )
         {
+                // access to a
                 System.out.println( "" + m_numThings + " B things!" );
         }
 }
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
index 11196d16..b3b83429 100644
--- a/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
+++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java
@@ -1,21 +1,27 @@
 package cuchaz.enigma.inputs.inheritanceTree;
 
+// none/d extends none/b
 public class SubsubclassAA extends SubclassA
 {
         protected SubsubclassAA( )
         {
+                // call to none/b.<init>(Ljava/lang/String;)V
                 super( "AA" );
         }
         
         @Override
+        // a()Ljava/lang/String;
         public String getName( )
         {
+                // call to none/b.a()Ljava/lang/String;
                 return "subsub" + super.getName();
         }
         
         @Override
+        // a()V
         public void doBaseThings( )
         {
+                // call to none/d.a()Ljava/lang/String;
                 System.out.println( "Base things by " + getName() );
         }
 }