From 5c5fb17a62627681164bc96d4397be3babf099a9 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 1 Jun 2005 16:13:16 +0000
Subject: [PATCH] GenericsWork: 5 new generics tests.

---
 .../systemtest/ajc150/GenericsTests.java      | 19 +++++++++++
 .../org/aspectj/systemtest/ajc150/ajc150.xml  | 34 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index 25efa7cbf..40519b2eb 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -39,5 +39,24 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 	public void testPR88606() {
 		runTest("Parameterized types on introduced fields not correctly recognized");
 	}
+
+    public void testPR97763() {
+	    runTest("ITD method with generic arg");
+    }
+
+    public void testGenericsBang_pr95993() {
+	    runTest("NPE at ClassScope.java:660 when compiling generic class");
+    }    
+	
+	public void testPR96220_GenericAspects1() {
+		runTest("generic aspects - 1");
+	}
 	
+	public void testPR96220_GenericAspects2() {
+		runTest("generic aspects - 2");
+	}
+	
+	public void testPR96220_GenericAspects3() {
+		runTest("declare parents");
+	}
 }
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 7f114ea56..a6768cb98 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2200,4 +2200,38 @@
    <ajc-test dir="bugs150" title="Exploding compile time with if() statements in pointcut">
      <compile files="PR94086.aj" options="-1.5"/>
    </ajc-test>
+   
+   <ajc-test dir="java5/generics/bugs" title="ITD method with generic arg">
+     <compile files="PR97763.aj" options="-1.5"/>
+     <run class="PR97763">
+       <stderr>
+         <line text="Number of entries=2"/>
+       </stderr>
+     </run>
+   </ajc-test>
+
+   <ajc-test dir="bugs150" title="NPE at ClassScope.java:660 when compiling generic class">
+     <compile files="PR95993.java" options="-1.5"/>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 1">
+     <compile files="GenericAspect1.aj" options="-1.5"/>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 2">
+     <compile files="GenericAspect2.aj" options="-1.5">
+       <message kind="error" line="9" text="can not extend"/>
+     </compile>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/genericaspects" title="declare parents">
+     <compile files="GenericAspect3.aj" options="-1.5"/>
+     <run class="GenericAspect3">
+      <stderr>
+		<line text="A"/>
+		<line text="B"/>
+      </stderr>
+     </run>
+   </ajc-test>
+   
 </suite>
\ No newline at end of file
-- 
2.39.5