Tests for 87282, 88606

4 files changed, 43 insertions, 0 deletions

diff --git a/tests/java5/generics/bugs/PR87282.aj b/tests/java5/generics/bugs/PR87282.aj
new file mode 100644
index 000000000..ff5e746a9
--- /dev/null
+++ b/tests/java5/generics/bugs/PR87282.aj
@@ -0,0 +1,15 @@
+import java.util.*;
+
+aspect introductionToA {
+ 
+  private ArrayList<B> PR87282.m_Array = new ArrayList<B>();  
+
+  public void PR87282.addB(B tmp){
+    m_Array.add(tmp);
+  }
+
+}
+
+public class PR87282 {}
+
+class B {}
diff --git a/tests/java5/generics/bugs/PR88606.aj b/tests/java5/generics/bugs/PR88606.aj
new file mode 100644
index 000000000..d72418da5
--- /dev/null
+++ b/tests/java5/generics/bugs/PR88606.aj
@@ -0,0 +1,11 @@
+
+public class PR88606 {}
+
+aspect Foo {
+
+    private java.util.List<Foo> PR88606.list;
+    
+    private void bar() {
+        java.util.List<Foo> li = new PR88606().list;
+    }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index fe265050a..25efa7cbf 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -31,4 +31,13 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 	public void testPR91053() {
 		runTest("Generics problem with Set");
 	}
+	
+	public void testPR87282() {
+		runTest("Compilation error on generic member introduction");
+	}
+	
+	public void testPR88606() {
+		runTest("Parameterized types on introduced fields not correctly recognized");
+	}
+	
 }
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index e9ef342c3..15afabbfe 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2169,5 +2169,13 @@
       <compile files="PR91053.aj" options="-1.5"/>
       <run class="PR91053"/>
    </ajc-test>
+   
+   <ajc-test dir="java5/generics/bugs" title="Compilation error on generic member introduction" vm="1.5">
+      <compile files="PR87282.aj" options="-1.5"/>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/bugs" title="Parameterized types on introduced fields not correctly recognized" vm="1.5">
+      <compile files="PR88606.aj" options="-1.5"/>
+   </ajc-test>
  
 </suite>
\ No newline at end of file