From: aclement <aclement>
Date: Thu, 16 Jun 2005 11:57:28 +0000 (+0000)
Subject: Tests and fixes for bug 100260: methods inherited from a generic parent
X-Git-Tag: PRE_ANDY~150
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b54831fd860a852310cf2b7e831df741d1545437;p=aspectj.git

Tests and fixes for bug 100260: methods inherited from a generic parent
---

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index c1e461849..cd2fd005d 100644
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 3afd719ae..64a2c2a56 100644
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ
diff --git a/tests/bugs150/pr100260.aj b/tests/bugs150/pr100260.aj
new file mode 100644
index 000000000..13f58b365
--- /dev/null
+++ b/tests/bugs150/pr100260.aj
@@ -0,0 +1,25 @@
+class Generic_Parent<T> {}
+
+class Child extends Generic_Parent<Integer> {}
+
+class Generic_Child<T> extends Generic_Parent<Integer> {}
+
+public aspect pr100260 {
+  public void Generic_Parent.inherited_method() {}
+  public int Generic_Parent.inherited_field;
+
+  public static void test() {
+    int inherited_field;
+    inherited_field = new Generic_Child().inherited_field; // works
+    inherited_field = new Generic_Child<Integer>().inherited_field; // works
+    inherited_field = new Child().inherited_field; // works
+
+    new Generic_Child().inherited_method(); // works
+    new Generic_Child<Integer>().inherited_method(); // unresolved
+    new Child().inherited_method(); // unresolved
+  }
+
+  public static void main(String []argv) {
+    test();
+  }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 1292a7475..35701e80f 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -183,7 +183,8 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testItdGenerics_pr99228()  {runTest("ITD of a field into a generic class");}
   public void testItdGenerics_pr98320()  {runTest("intertype with nested generic type");}
   public void testItdGenerics_pr100227() {runTest("inner class with generic enclosing class");}
-
+  public void testItdGenerics_pr100260() {runTest("methods inherited from a generic parent");}
+  
   // helper methods.....
   
   public SyntheticRepository createRepos(File cpentry) {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 48cadc36e..c156bc7bd 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2287,6 +2287,11 @@
      </run>
    </ajc-test>
    
+   <ajc-test dir="bugs150" pr="100260" title="methods inherited from a generic parent">
+     <compile files="pr100260.aj" options="-1.5"/>
+     <run class="pr100260"/>
+   </ajc-test>
+   
    // end of generic bugs
 
    // generic aspects