253109: testcode

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index 2c83fd4db29857acc62607602066619a16b5fb9b..8713edbb50d9bf633214f277c76e54b8ddacde56 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -31,6 +31,10 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                runTest("generic pointcuts - 2");
        }
 
+       public void testGenericPointcuts_3() {
+               runTest("generic pointcuts - 3");
+       }
+
        public void testBrokenLVT_pr194314_1() throws Exception {
                runTest("broken lvt - 1");
                JavaClass jc = Utils.getClassFrom(ajc.getSandboxDirectory().getAbsolutePath(), "Service");
@@ -65,28 +69,20 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                System.out.println(m.getLocalVariableTable());
                LocalVariable[] lvt = m.getLocalVariableTable().getLocalVariableTable();
                assertEquals(8, lvt.length);
-               // assertEquals(2,
-               // m.getLocalVariableTable().getLocalVariableTable().length);
+               // assertEquals(2, m.getLocalVariableTable().getLocalVariableTable().length);
 
                // Before I've started any work on this:
-               // LocalVariable(start_pc = 0, length = 68, index =
-               // 0:ServiceInterceptorCodeStyle this)
-               // LocalVariable(start_pc = 0, length = 68, index =
-               // 1:org.aspectj.runtime.internal.AroundClosure ajc_aroundClosure)
-               // LocalVariable(start_pc = 0, length = 68, index =
-               // 2:org.aspectj.lang.JoinPoint thisJoinPoint)
+               // LocalVariable(start_pc = 0, length = 68, index = 0:ServiceInterceptorCodeStyle this)
+               // LocalVariable(start_pc = 0, length = 68, index = 1:org.aspectj.runtime.internal.AroundClosure ajc_aroundClosure)
+               // LocalVariable(start_pc = 0, length = 68, index = 2:org.aspectj.lang.JoinPoint thisJoinPoint)
                // LocalVariable(start_pc = 9, length = 59, index = 3:Object[] args)
                // LocalVariable(start_pc = 21, length = 47, index = 4:long id)
 
                // Method signature:
-               // private static final void method_aroundBody1$advice(Service, long,
-               // org.aspectj.lang.JoinPoint,
-               // ServiceInterceptorCodeStyle,
-               // org.aspectj.runtime.internal.AroundClosure,
-               // org.aspectj.lang.JoinPoint);
+               // private static final void method_aroundBody1$advice(Service, long, org.aspectj.lang.JoinPoint,
+               // ServiceInterceptorCodeStyle, org.aspectj.runtime.internal.AroundClosure, org.aspectj.lang.JoinPoint);
                //
-               // Service, JoinPoint, ServiceInterceptorCodeStyle, AroundClosure,
-               // JoinPoint
+               // Service, JoinPoint, ServiceInterceptorCodeStyle, AroundClosure, JoinPoint
 
                // args should be in slot 7 and the long in position 8
 

diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index b7ddfa85c077057dc3cdddcdc13256ae8cd98be9..29dfada49b1e1a986fd50162730558df1a2aded9 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -15,6 +15,18 @@
       </compile>
     </ajc-test>
     
+    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 3">
+      <compile files="CodeThree.java" options="-1.5 -showWeaveInfo">      
+        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:4)"/>
+        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:5) [with runtime test]"/>
+        <message kind="warning" line="6" text="has not been applied"/>
+        <message kind="warning" line="7" text="has not been applied"/>
+        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:8)"/>
+        <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:9) [with runtime test]"/> 
+        <message kind="warning" line="5" text="unchecked"/>        
+        <message kind="warning" line="9" text="unchecked"/>        
+      </compile>
+    </ajc-test>
 
     <ajc-test dir="bugs163/pr194314" title="broken lvt - 1">
       <compile files="Service.java IService.java Main.java ServiceInterceptor.java" options="-1.5"/>