test and fix for 132926

2 files changed, 33 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index 2c33e7bb6..81f495b89 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -25,6 +25,12 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
     
+	// reported on the list...
+//  public void testDeca() { runTest("doubly annotating a method with declare");}
+	
+  public void testCrashingWithASM_pr132926_1() { runTest("crashing on annotation type resolving with asm - 1");}
+  public void testCrashingWithASM_pr132926_2() { runTest("crashing on annotation type resolving with asm - 2");}
+  public void testCrashingWithASM_pr132926_3() { runTest("crashing on annotation type resolving with asm - 3");}
   public void testGenericAdviceParameters_pr123553()    { runTest("generic advice parameters");}
   public void testMemberTypesInGenericTypes_pr122458()    { runTest("member types in generic types");}
   public void testMemberTypesInGenericTypes_pr122458_2()  { runTest("member types in generic types - 2");}
diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index 5d83c75f5..c627cf8ff 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -2,12 +2,39 @@
 
 <!-- AspectJ v1.5.1 Tests -->
 <suite>
+
+    <ajc-test dir="bugs151/pr132926" pr="132926" title="crashing on annotation type resolving with asm - 1">
+     <compile files="InputAnnotation.java,AffectedType.java" options="-1.5"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs151/pr132926" pr="132926" title="crashing on annotation type resolving with asm - 2">
+     <compile files="InputAnnotation.java" outjar="foo.jar" options="-1.5"/>
+     <compile files="AffectedType.java" classpath="foo.jar" options="-1.5"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs151/pr132926" pr="132926" title="crashing on annotation type resolving with asm - 3">
+     <compile files="InputAnnotation2.java" outjar="foo.jar" options="-1.5"/>
+     <compile files="AffectedType.java" classpath="foo.jar" options="-1.5">
+     	<message kind="error" line="9" text="AffectedType is not a valid target for annotation InputAnnotation, this annotation can only be applied to these element types {METHOD}"/>
+     </compile>
+    </ajc-test>
     
     <ajc-test dir="bugs151/pr123553" title="generic advice parameters">
         <compile files="A.java" options="-1.5"/>
         <run class="A"/>
     </ajc-test>  
     
+    <ajc-test dir="bugs151/Deca" title="doubly annotating a method with declare">
+      <compile files="DecA.java" options="-1.5"/>
+      <run class="DecA">
+        <stderr>
+          <line text="There are 2 annotations on public void m()"/>
+          <line text="1) @One()"/>
+          <line text="2) @Two()"/>
+        </stderr>
+      </run>
+    </ajc-test>
+    
      <ajc-test dir="bugs151/pr129566" title="arrayindexoutofbounds">
         <compile files="SkipList.java" options="-1.5"/>
     </ajc-test>