fixing bugs

3 files changed, 72 insertions, 48 deletions

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index b7d215e53..b488f68af 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -1586,6 +1586,8 @@
       title="decent errors for around return type not matching target point"
       keywords="from-errors">
         <compile files="AroundReturnType.java">
+            <message kind="error" line="3"/>
+            <message kind="error" line="7"/>
             <message kind="error" line="16"/>
             <message kind="error" line="21"/>
         </compile>
@@ -5442,4 +5444,59 @@
         <compile files="InterFieldArrays.java"/>
         <run class="InterFieldArrays"/>
     </ajc-test>
+    
+    <ajc-test dir="new"
+      title="unmatched type name in a declare parents should result in a warning in -Xlint mode"
+      keywords="tofix">
+        <compile options="-Xlint" files="MissingTypeInDeclareParents.java">
+            <message kind="warning" line="20"/>
+        </compile>
+        <run class="MissingTypeInDeclareParents"/>
+    </ajc-test>
+    
+    <ajc-test dir="new" pr="838"
+      title="checking around join point for advice return type - numeric">
+        <compile files="AroundNumericCastCE.java">
+            <message kind="error" line="12"/>
+            <message kind="error" line="17"/>
+        </compile>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="836" title="void around advice without proceed">
+        <compile files="VoidAround.java">
+            <message kind="error" line="11"/>
+            <message kind="error" line="29"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new/PR852" pr="852"
+      title="declaring method on superclass and subclass">
+        <compile files="aspectPack/Aspect.java,target/SubClass.java,target/SuperClass.java">
+          <dir-changes added="target.SubClass,target.SuperClass"/>
+        </compile>
+        <run class="aspectPack.Aspect"/>
+    </ajc-test>
+    
+    <!-- Can't handle packages named 'aspect' in parser
+    -->
+    <ajc-test dir="new/PR852" pr="852"
+      title="declaring method on superclass and subclass"
+      keywords="knownLimitation">
+        <compile files="aspect/Aspect.java,target/SubClass.java,target/SuperClass.java">
+          <dir-changes added="target.SubClass,target.SuperClass"/>
+        </compile>
+        <run class="aspect.Aspect"/>
+    </ajc-test>
+    
+	<!-- The correct behavior of this program is to produce an Xlint
+	     warning for the lack of access to the needed type, and then
+	     to generate code with link errors that will throw a NoSuchMethodError
+	     when run.
+	-->
+    <ajc-test dir="bugs" pr="906"
+      title="privileged access to code outside the control of the compiler">
+        <compile files="PrivilegeBeyondScope.java" options="-Xlint:warning">
+		  <message kind="warning" line="23"/>
+        </compile>
+    </ajc-test>    
 </suite>
diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index a0f890f7a..829e26973 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -2,16 +2,9 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
 
 <suite>
-
-    <ajc-test dir="new"
-      title="unmatched type name in a declare parents should result in a warning in -Xlint mode"
-      keywords="tofix">
-        <compile options="-Xlint" files="MissingTypeInDeclareParents.java">
-            <message kind="warning" line="20"/>
-        </compile>
-        <run class="MissingTypeInDeclareParents"/>
-    </ajc-test>
-
+	<!-- This is an open question.  Is it better for aspect static initializers
+	     to run before or after the instance is constructed???
+	-->
     <ajc-test dir="new" pr="804"
       title="aspect static initializers should run before instance constructed"
       keywords="tofix">
@@ -19,30 +12,6 @@
         <run class="AspectStaticInit"/>
     </ajc-test>
 
-
-    <ajc-test dir="new" pr="838"
-      title="checking around join point for advice return type - numeric"
-      keywords="tofix" comment="may need to fix error line when bug is fixed">
-        <compile files="AroundNumericCastCE.java">
-            <message kind="error" line="17"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new" pr="836" title="void around advice without proceed"
-      keywords="tofix">
-        <compile files="VoidAround.java">
-            <message kind="error" line="29"/>
-        </compile>
-    </ajc-test>
-
-    <ajc-test dir="new/PR852" pr="852"
-      title="declaring method on superclass and subclass">
-        <compile files="aspect/Aspect.java,target/SubClass.java,target/SuperClass.java">
-          <dir-changes added="target.SubClass,target.SuperClass"/>
-        </compile>
-        <run class="aspect.Aspect"/>
-    </ajc-test>
-
     <ajc-test dir="new/PR862" pr="862"
       title="import any inner from interface implementor"
       keywords="purejava">
@@ -51,14 +20,6 @@
         </compile>
         <run class="pack.ImportInnerFromInterfaceImplementor"/>
     </ajc-test>
-
-    <ajc-test dir="bugs" pr="906"
-      title="privileged access to code outside the control of the compiler">
-        <compile files="PrivilegeBeyondScope.java">
-		  <message kind="error" line="21"/>
-        </compile>
-        <run class="PrivilegeBeyondScope"/>
-    </ajc-test>
     
     <ajc-test dir="new"
       title="incompatible advice throws clause are a compile-time error"
diff --git a/tests/jimTests.xml b/tests/jimTests.xml
index 4421c26ad..b8618fb39 100644
--- a/tests/jimTests.xml
+++ b/tests/jimTests.xml
@@ -1,13 +1,19 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
 <suite>
 
-    <ajc-test dir="new"
-      title="unmatched type name in a declare parents should result in a warning in -Xlint mode"
-      keywords="tofix">
-        <compile options="-Xlint" files="MissingTypeInDeclareParents.java">
-            <message kind="warning" line="20"/>
+
+    <ajc-test dir="errors" pr="244"
+      title="decent errors for around return type not matching target point"
+      keywords="from-errors">
+        <compile files="AroundReturnType.java">
+            <message kind="error" line="3"/>
+            <message kind="error" line="7"/>
+            <message kind="error" line="16"/>
+            <message kind="error" line="21"/>
         </compile>
-        <run class="MissingTypeInDeclareParents"/>
     </ajc-test>
+    
+    <!--
 
+	-->
 </suite>
\ No newline at end of file