fix for Bugzilla Bug 37020

 	wrong line for method execution join point

diff --git a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
index d72492811d0b2ecd2d2ab9c94797498faac3f26b..93353cb8ef0788a51eebd09d74d502fe0049c8c1 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc121/Ajc121Tests.java
@@ -244,5 +244,9 @@ public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        runTest("Inconsistency in scoping of protected members in ITDs");
   }
   
+  public void test045_wrongLineForExecutionJoinPoint() {
+       runTest("wrong line for method execution join point");
+  }
+
 }
 

diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index 3116d9a50c926b684cd8022e02074f7b4fbd874a..94c9db44f9e3604e98d01b0a6a98e2a74a44c406 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -354,4 +354,27 @@
                        <message kind="error" line="11" text="The method clone() from the type Object is not visible"/>
                        <message kind="error" line="12" text="The method clone() from the type Object is not static"/>
                </compile>
+       </ajc-test>
+       
+       <ajc-test dir="design/sourceLines" pr="37020"
+               title="wrong line for method execution join point">
+               <compile files="TestSourceLines.java">
+                       <message kind="warning" line="5" text="static init"/>
+                       <message kind="warning" line="12" text="cons execution"/>
+                       <message kind="warning" line="12" text="pre-init"/>
+                       <message kind="warning" line="12" text="init"/>
+                       <message kind="warning" line="16" text="cons execution"/>
+                       <message kind="warning" line="16" text="init"/>
+                       <message kind="warning" line="16" text="pre-init"/>
+                       <message kind="warning" line="20" text="method execution"/>
+                       <message kind="warning" line="24" text="method execution"/>
+                       <message kind="warning" line="28" text="method execution"/>
+                       <message kind="warning" line="35" text="static init"/>
+                       <message kind="warning" line="35" text="init"/>
+                       <message kind="warning" line="35" text="pre-init"/>
+                       <message kind="warning" line="39" text="pre-init"/>
+                       <message kind="warning" line="39" text="init"/>
+                       <message kind="warning" line="39" text="static init"/>
+                       <message kind="warning" line="47" text="advice"/>
+               </compile>
        </ajc-test>
\ No newline at end of file