test case for pr106634 :

  regression: argument causes BcelGenericSignatureToTypeXConverter.java:203

3 files changed, 44 insertions, 3 deletions

diff --git a/tests/bugs150/pr106634.aj b/tests/bugs150/pr106634.aj
new file mode 100644
index 000000000..2e916e5f2
--- /dev/null
+++ b/tests/bugs150/pr106634.aj
@@ -0,0 +1,5 @@
+import java.util.*;
+
+public class pr106634 extends Vector {
+	void test(Object argument) {}
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 8ecef9a1d..36b3a0b91 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -192,6 +192,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   
   public void testSyntaxErrorNPE_pr103266() {runTest("NPE on syntax error");}
   
+  public void testIllegalStateExceptionOnNestedParameterizedType_pr106634() { 
+	  runTest("IllegalStateException unpacking signature of nested parameterized type");
+  }
+  
   public void testMissingNamePattern_pr106461() { runTest("missing name pattern"); }
   
   // helper methods.....
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index ef77a0528..7cf4fa774 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -174,13 +174,17 @@
         <compile files="Rainbow.java" options="-emacssym,-1.5"/>
     </ajc-test>
     
-    <ajc-test dir="bugs150" title="missing name pattern">
+    <ajc-test dir="bugs150" pr="10461" title="missing name pattern">
         <compile files="PR106461.aj">
             <message kind="error" line="3" text="Syntax error on token &quot;(&quot;, &quot;name pattern&quot; expected"/>
             <message kind="error" line="5" text="Syntax error on token &quot;)&quot;, &quot;name pattern&quot; expected"/>
             <message kind="error" line="7" text="Syntax error on token &quot;.&quot;, &quot;name pattern&quot; expected"/>
         </compile>
     </ajc-test>
+    
+    <ajc-test dir="bugs150" pr="106634" title="IllegalStateException unpacking signature of nested parameterized type">
+        <compile files="pr106634.aj" options="-1.5"/>
+    </ajc-test>
         
     <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
         <compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.5"/>
@@ -2316,12 +2320,14 @@
    <!-- generic aspects -->
    
    <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 1">
-     <compile files="GenericAspect1.aj" options="-1.5"/>
+     <compile files="GenericAspect1.aj" options="-1.5">
+         <message kind="error" line="2" text="only abstract aspects can have type parameters"/>
+     </compile>
    </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"/>
+       <message kind="error" line="9" text="a generic super-aspect must be fully parameterized in an extends clause"/>
      </compile>
    </ajc-test>
    
@@ -2339,6 +2345,32 @@
      <compile files="ParentChildRelationship.aj" options="-1.5"/>
    </ajc-test>
    
+   <ajc-test dir="java5/generics/genericaspects" title="generic aspect with declare warning using type vars">
+     <compile files="DeclareWarningInGenericAspect.aj" options="-1.5">
+         <message kind="warning" line="16" text="this method takes a T!"/>
+     </compile>
+   </ajc-test>
+
+   <ajc-test dir="java5/generics/genericaspects" title="generic aspect with execution advice using type vars">
+     <compile files="ExecutionAdviceInGenericAspect.aj" options="-1.5">
+     </compile>
+     <run class="ExecutionAdviceInGenericAspect">
+         <stdout>
+             <line text="I matched at execution(void C.foo(String))"/>
+         </stdout>
+     </run>
+   </ajc-test>
+
+  <ajc-test dir="java5/generics/genericaspects" title="generic aspect with anonymous pointcut">
+     <compile files="AnonymousPointcutInGenericAspect.aj" options="-1.5">
+     </compile>
+     <run class="AnonymousPointcutInGenericAspect">
+         <stdout>
+             <line text="I matched at execution(void C.foo(String))"/>
+         </stdout>
+     </run>
+   </ajc-test>
+            
    <!-- ajdk example -->
    <ajc-test dir="java5/generics/genericaspects" title="generic aspects - 5 (ajdk)">
      <compile files="Blob.java,BlobContainment.aj,ParentChildRelationship.aj" options="-1.5"/>