332388: test and fix

5 files changed, 29 insertions, 0 deletions

diff --git a/tests/bugs1611/pr332388_2/A.java b/tests/bugs1611/pr332388_2/A.java
new file mode 100644
index 000000000..75835bc31
--- /dev/null
+++ b/tests/bugs1611/pr332388_2/A.java
@@ -0,0 +1,6 @@
+public class A<T> {
+  public void a(Class<? extends M> list) {}
+  public void x() {
+    a(null);
+  }
+}
diff --git a/tests/bugs1611/pr332388_2/M.java b/tests/bugs1611/pr332388_2/M.java
new file mode 100644
index 000000000..9b4658fd8
--- /dev/null
+++ b/tests/bugs1611/pr332388_2/M.java
@@ -0,0 +1 @@
+public class M {}
diff --git a/tests/bugs1611/pr332388_2/MyAspect.java b/tests/bugs1611/pr332388_2/MyAspect.java
new file mode 100644
index 000000000..9252d17c1
--- /dev/null
+++ b/tests/bugs1611/pr332388_2/MyAspect.java
@@ -0,0 +1,9 @@
+import org.aspectj.lang.annotation.*;
+
+@Aspect
+public class MyAspect {
+  @Before("call(* *.*(..)) && target(x)")
+  public void myAdvice(CharSequence x) {
+    System.out.println();
+  }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index 75a4f51cf..408ebb02d 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -25,6 +25,10 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("pr332388");
 	}
 
+	public void testMissingType_332388_2() {
+		runTest("pr332388 - 2");
+	}
+
 	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 58be6e641..56434cff6 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -22,4 +22,13 @@
      </compile>
   </ajc-test>
   
+  <ajc-test dir="bugs1611/pr332388_2" title="pr332388 - 2">
+     <compile files="M.java" outjar="M.jar" options="-1.5"/>
+     <compile files="A.java" classpath="M.jar" outjar="A.jar" options="-1.5"/>
+     <compile files="MyAspect.java" outjar="aspects.jar" options="-1.5"/>
+     <compile files="" aspectpath="aspects.jar" inpath="A.jar" options="-1.5">
+     <message kind="error" text="Unable to find type (for bound): M"/>
+     </compile>
+  </ajc-test>
+  
 </suite>
\ No newline at end of file