From 38084566dbf9d17cbe375f7fdfa14a821e3d7311 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 3 Nov 2005 15:31:39 +0000
Subject: [PATCH] test and fix for 86903

---
 .../systemtest/ajc150/Ajc150Tests.java        |  1 +
 .../org/aspectj/systemtest/ajc150/ajc150.xml  | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 82de22113..fb7f77f39 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -66,6 +66,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testBadDecp_pr110788_4() { runTest("bad generic decp - 4");}
 
   public void testVarargsITD_pr110906() { runTest("ITD varargs problem");}
+  public void testBadRenderer_pr86903() { runTest("bcelrenderer bad");}
   
   public void testIncompatibleClassChangeError_pr113630_1() {runTest("IncompatibleClassChangeError - errorscenario");}
   public void testIncompatibleClassChangeError_pr113630_2() {runTest("IncompatibleClassChangeError - workingscenario");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index bd5016402..6e569be05 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -21,6 +21,11 @@
       </compile>
     </ajc-test>
     
+    <ajc-test dir="bugs150/pr86903" title="bcelrenderer bad">
+      <compile files="GenericService.java,Service.java,Main.java,BadWormhole.java"/>
+      <run class="Main"/>
+    </ajc-test>
+    
     <ajc-test dir="bugs150/pr114343" title="field-get, generics and around advice">
       <compile files="Test.java,Test1.java,Test2.java,TestAspect.aj" options="-1.5">
           <message kind="warning" line="7" text="unchecked conversion when advice applied at shadow field-get(java.util.Set Test1.intsSet), expected java.util.Set&lt;java.lang.Integer&gt; but advice uses java.util.Set"/>
@@ -29,7 +34,19 @@
       <run class="TestAspect"/>
     </ajc-test>
     
-    <ajc-test dir="bugs150/pr114343/case2" title="field-get, generics and around advice - 2">
+    <ajc-test dir="bugs150/pr113947/case1" title="maws generic aspect - 1">
+        <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.5">
+          <!-- the 'static ref' messages are a bit poor and ought to be eliminated... -->
+          <message kind="error" line="6" text="Cannot make a static reference to the non-static type M"/>
+          <message kind="error" line="6" text="Cannot make inter-type declarations on type variables"/>
+          <message kind="error" line="8" text="Cannot make a static reference to the non-static type I"/>
+          <message kind="error" line="8" text="Cannot make inter-type declarations on type variables"/>
+          <message kind="error" line="12" text="Cannot make a static reference to the non-static type M"/>
+          <message kind="error" line="12" text="Cannot make inter-type declarations on type variables"/>
+        </compile>
+    </ajc-test>
+
+   <ajc-test dir="bugs150/pr114343/case2" title="field-get, generics and around advice - 2">
       <compile files="Test.java,TTT.java,TestAspect.java" options="-1.5"/>
       <run class="TestAspect">
         <stderr>
@@ -62,18 +79,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
-    <ajc-test dir="bugs150/pr113947/case1" title="maws generic aspect - 1">
-        <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.5">
-          <!-- the 'static ref' messages are a bit poor and ought to be eliminated... -->
-          <message kind="error" line="6" text="Cannot make a static reference to the non-static type M"/>
-          <message kind="error" line="6" text="Cannot make inter-type declarations on type variables"/>
-          <message kind="error" line="8" text="Cannot make a static reference to the non-static type I"/>
-          <message kind="error" line="8" text="Cannot make inter-type declarations on type variables"/>
-          <message kind="error" line="12" text="Cannot make a static reference to the non-static type M"/>
-          <message kind="error" line="12" text="Cannot make inter-type declarations on type variables"/>
-        </compile>
-    </ajc-test>
+
 
     <ajc-test dir="bugs150/pr113947/case2" title="maws generic aspect - 2">
         <compile files="AbstractListSupport.java,AnotherItem.java,Item.java,LinkedList.java,LinkedListItem.java,ListItem.java,StringList.java" options="-1.5"/>
-- 
2.39.5