With type mungers remembering their location, we now get a sensible error line for...

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java
index de45e9ea5cbe242f2c26589c94d09ec69b5015ed..7d0bdf113744016302e190c2ab7ee284e9c68739 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PartiallyExposedHierarchyTestCase.java
@@ -37,8 +37,7 @@ public class PartiallyExposedHierarchyTestCase extends AjcTestCase {
         */
        public void testPartiallyExposedHierarchy () {
                Message warning = new Message(11,"no interface constructor-execution join point");
-               //TODO This line number will change to 15 (from 5) when type mungers remember where they came from!
-               Message error   = new Message(5, "type sample.Base must be accessible for weaving interface inter type declaration from aspect sample.Trace");
+               Message error   = new Message(15, "type sample.Base must be accessible for weaving interface inter type declaration from aspect sample.Trace");
                CompilationResult result = ajc(baseDir,
                                new String[]{"-classpath","fullBase.jar",
                                                         "-injars","base.jar",

diff --git a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
index f121ac3f1722610dd3d3e3b29857d0ae4419de7c..236181cd7beef2e18406cdf1a5454fcb5491719a 100644 (file)
--- a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
+++ b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml
@@ -87,7 +87,7 @@
                <compile files="Test.java, Util.java"/>
         <run class="Test"/>
                <compile files="Test.java, Util.java, ITDField.aj" options="-Xlint:error">
-            <message kind="error" line="0"/>
+            <message kind="error" line="3"/>
                </compile>
        </ajc-test>