fix for Bugzilla Bug 37020

 	wrong line for method execution join point

diff --git a/tests/design/sourceLines/TestSourceLines.java b/tests/design/sourceLines/TestSourceLines.java
index 8a97048e853ec070de2f741266f658b028837dbb..f3613532c9010cc81c5091b06222af3f069b2491 100644 (file)
--- a/tests/design/sourceLines/TestSourceLines.java
+++ b/tests/design/sourceLines/TestSourceLines.java
@@ -41,7 +41,7 @@ aspect CheckLineNumbers {  // L39
        declare warning : execution(* TestSourceLines.*(..)) : "method execution";
        declare warning : execution(TestSourceLines.new(..)) : "cons execution";
        declare warning : staticinitialization(*) : "static init";
-       declare warning : initialization(*.new(..)) : "init";
+       declare warning : initialization(*.new(..)) : "just-init";
        declare warning : preinitialization(*.new(..)) : "pre-init";
        
        before() : execution(* TestSourceLines.*(..)) {  // L47

diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index 94c9db44f9e3604e98d01b0a6a98e2a74a44c406..9ec3782b4de58d74d57ef9d9e2367c6547c959fd 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -362,18 +362,18 @@
                        <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="12" text="just-init"/>
                        <message kind="warning" line="16" text="cons execution"/>
-                       <message kind="warning" line="16" text="init"/>
+                       <message kind="warning" line="16" text="just-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="just-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="just-init"/>
                        <message kind="warning" line="39" text="static init"/>
                        <message kind="warning" line="47" text="advice"/>
                </compile>