From ba9d43ccaf2660ddc9916ea48f79a77ba60d435e Mon Sep 17 00:00:00 2001
From: Andy Clement <andrew.clement@gmail.com>
Date: Fri, 15 Jun 2012 11:29:35 -0700
Subject: 382723

---
 .../org/aspectj/systemtest/ajc170/Ajc170Tests.java | 20 +++++++++++++
 tests/src/org/aspectj/systemtest/ajc170/ajc170.xml | 33 ++++++++++++++++++++++
 2 files changed, 53 insertions(+)

(limited to 'tests/src')

diff --git a/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java b/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java
index 3896a93ab..3585e782a 100644
--- a/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc170/Ajc170Tests.java
@@ -37,6 +37,26 @@ public class Ajc170Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 //
 //	public void testLostAnnos_377130_2() {
 //		runTest("missing annos on priv aspects - 2");
+//	}
+	
+	public void testGenericAspectAround382723() {
+		runTest("generic aspect");
+	}
+
+	public void testGenericAspectAround382723_2() {
+		runTest("generic aspect 2");
+	}
+
+	public void testGenericAspectAround382723_3() {
+		runTest("generic aspect 3");
+	}
+	
+	public void testGenericAspectAround382723_4() {
+		runTest("generic aspect 4");
+	}
+	
+//	public void testCovariantGenericsItd382189() {
+//		runTest("covariant generics");
 //	}
 
 	public void testAttributeErrorJ7() {
diff --git a/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml b/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml
index 459ba902c..05ebd0ee2 100644
--- a/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml
+++ b/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml
@@ -2,6 +2,39 @@
 
 <suite>
 
+	<ajc-test dir="bugs170/pr382723" title="generic aspect">
+		<compile files="FooAspect.java" options="-1.5"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs170/pr382723" title="generic aspect 2">
+		<compile files="FooAspect2.java" options="-1.5"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs170/pr382723" title="generic aspect 3">
+		<compile files="FooAspect3.java" options="-1.5"/>
+	</ajc-test>
+	
+	<ajc-test dir="bugs170/pr382723" title="generic aspect 4">
+		<compile files="Foo.java" options="-1.5 -showWeaveInfo">
+			<message kind="weave" text="Join point 'constructor-call(void java.util.LinkedList.&lt;init&gt;())' in Type 'Foo' (Foo.java:41) advised by around advice from 'Bar' (Foo.java:14)"/>
+		</compile>
+		<run class="Foo">
+			<stdout>
+				<line text="superaspect getNumber returns -2"/>
+				<line text="Bar.method() running"/>
+				<line text="abstract method returns []"/>
+			</stdout>
+		</run>
+	</ajc-test>
+	
+	<ajc-test dir="bugs170/pr382189" title="covariant generics">
+	<compile files="covbug/A.java covbug/A_ITD.aj covbug/B.java covbug/SuperA.java covbug/SuperB.java" options="-1.5"/>
+	<!-- <run class="Foo">
+	<stdout>
+	<line text="@Anno()"/></stdout>
+	</run> -->
+	</ajc-test>
+	
 	<ajc-test dir="bugs170/pr377130" title="missing annos on priv aspects">
 	<compile files="Foo.java" options="-1.5"/>
 	<run class="Foo">
-- 
cgit v1.2.3