Changes in staticinitialization sloc reported, see pr 91090

diff --git a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml
index d9849ceb3c2c2c3cbfd21fa5a3def83344b439d7..1ca899087f3c1866725e34cfcd610a085cc22f3d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml
@@ -391,7 +391,7 @@
     <ajc-test dir="new/declare" pr="31724"
             title="omnibus declare warning context">
         <compile files="DeclareWarning.java">
-            <message kind="warning" line="5" text="staticinitialization(DeclareWarning)"/>
+            <message kind="warning" line="3" text="staticinitialization(DeclareWarning)"/>
             <message kind="warning" line="12" text="call(DeclareWarning.new())"/>
             <message kind="warning" line="13" text="get staticInt"/>
             <message kind="warning" line="14" text="get instanceInt"/>

diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
index be0f58644d334c9765c4c5c0db71fbbeaa039979..54f6047032485e162c3408c399e7aeac953609c4 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml
@@ -354,7 +354,7 @@
        <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="1" 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="just-init"/>

diff --git a/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml b/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml
index 18d78cf2868bfb33e3a1c464eb36284cce74c26c..40d09461444d16bd84dde8e89e4a1b2790fda852 100644 (file)
--- a/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml
+++ b/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml
@@ -34,7 +34,7 @@
     <ajc-test dir="new/binaryWarnings/src" pr="37020"
         title="declare warnings on main">
         <compile files="aspects/MainWarnings.java,app/Main.java">
-               <message line="6"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
+               <message line="4"  text="staticinitialization(Main)" kind="warning" file="app/Main.java" />
                <message line="6"  text="set(String Main.staticString)" kind="warning" file="app/Main.java" />
                <message line="8"  text="set(String Main.s)" kind="warning" file="app/Main.java" />
                <message line="12" text="get(String Main.staticString)" kind="warning" file="app/Main.java" />