From 13fff7553a5871b06c8497d5093dae051a3a570a Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 13 Dec 2010 19:13:56 +0000
Subject: [PATCH] 332388: test and fix

---
 tests/bugs1611/pr332388/A.java                         |  4 ++++
 tests/bugs1611/pr332388/B.java                         |  5 +++++
 tests/bugs1611/pr332388/M.java                         |  1 +
 tests/bugs1611/pr332388/MyAspect.java                  | 10 ++++++++++
 .../org/aspectj/systemtest/ajc1611/Ajc1611Tests.java   |  4 ++++
 tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml   |  9 +++++++++
 6 files changed, 33 insertions(+)
 create mode 100644 tests/bugs1611/pr332388/A.java
 create mode 100644 tests/bugs1611/pr332388/B.java
 create mode 100644 tests/bugs1611/pr332388/M.java
 create mode 100644 tests/bugs1611/pr332388/MyAspect.java

diff --git a/tests/bugs1611/pr332388/A.java b/tests/bugs1611/pr332388/A.java
new file mode 100644
index 000000000..fa035fab2
--- /dev/null
+++ b/tests/bugs1611/pr332388/A.java
@@ -0,0 +1,4 @@
+public class A<T extends M> {
+  public void a(T t) {
+  }
+}
diff --git a/tests/bugs1611/pr332388/B.java b/tests/bugs1611/pr332388/B.java
new file mode 100644
index 000000000..0784bafa7
--- /dev/null
+++ b/tests/bugs1611/pr332388/B.java
@@ -0,0 +1,5 @@
+public class B<T extends M> extends A<T> {
+  public void b() {
+    a(null);
+  }
+}
diff --git a/tests/bugs1611/pr332388/M.java b/tests/bugs1611/pr332388/M.java
new file mode 100644
index 000000000..9b4658fd8
--- /dev/null
+++ b/tests/bugs1611/pr332388/M.java
@@ -0,0 +1 @@
+public class M {}
diff --git a/tests/bugs1611/pr332388/MyAspect.java b/tests/bugs1611/pr332388/MyAspect.java
new file mode 100644
index 000000000..769228378
--- /dev/null
+++ b/tests/bugs1611/pr332388/MyAspect.java
@@ -0,0 +1,10 @@
+import java.lang.annotation.*;
+import org.aspectj.lang.annotation.*;
+
+@Aspect
+public class MyAspect {
+  @Before("call(* *.*(..))")
+  public void myAdvice() {
+    System.out.println();
+  }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index b6166af2d..75a4f51cf 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -21,6 +21,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
  */
 public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	public void testMissingType_332388() {
+		runTest("pr332388");
+	}
+
 	public void testDeclareField_328840() {
 		runTest("pr328840");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
index 40acb25c6..58be6e641 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -13,4 +13,13 @@
     </stdout></run>
   </ajc-test>
   
+  <ajc-test dir="bugs1611/pr332388" title="pr332388">
+     <compile files="M.java" outjar="M.jar" options="-1.5"/>
+     <compile files="A.java B.java" classpath="M.jar" outjar="AB.jar" options="-1.5"/>
+     <compile files="MyAspect.java" outjar="aspects.jar" options="-1.5"/>
+     <compile files="" aspectpath="aspects.jar" inpath="AB.jar" options="-1.5">
+     <message kind="error" text="Unable to find type for generic bound.  Missing type is M"/>
+     </compile>
+  </ajc-test>
+  
 </suite>
\ No newline at end of file
-- 
2.39.5