fixing and cleanup

all tests in ajcTests are either passing or flagged with purejava or knownLimitation

3 files changed, 37 insertions, 104 deletions

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 46d3e03a6..b7d215e53 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -3650,6 +3650,10 @@
         <run class="p.Driver"/>
     </ajc-test>
 
+	<!-- This has a complicated set of expected join points.
+	     This test should be borken up into more manageable chunks
+	     and more carefully analyzed for correctness in the future.
+	-->
     <ajc-test dir="new" pr="490"
       title="elaborated into testing of around on all join points"
       keywords="from-resolved_10x">
@@ -3835,17 +3839,6 @@
         <run class="AdviceThrowsCp"/>
     </ajc-test>
 
-    <ajc-test dir="new"
-      title="incompatible advice throws clause are a compile-time error"
-      keywords="from-resolved_10x">
-        <compile files="AdviceThrowsCf.java">
-            <message kind="error" line="70"/>
-            <message kind="error" line="74"/>
-            <message kind="error" line="76"/>
-            <message kind="error" line="78"/>
-        </compile>
-    </ajc-test>
-
     <ajc-test dir="new" pr="570"
       title="potential method conflicts with introductions and interfaces and PR#561"
       keywords="from-resolved_10x">
@@ -4171,13 +4164,6 @@
     </ajc-test>
 
     <ajc-test dir="new"
-      title="can't apply around advice to the execution of around advice"
-      keywords="from-resolved_10x">
-        <compile files="CflowCycles.java"/>
-        <run class="CflowCycles"/>
-    </ajc-test>
-
-    <ajc-test dir="new"
       title="beautiful recursive computation of factorial with around is now supported"
       keywords="from-resolved_10x">
         <compile files="CircularAdvice.java"/>
@@ -4506,15 +4492,6 @@
         <run class="ArgsInCflow2"/>
     </ajc-test>
 
-    <ajc-test dir="new" pr="660" title="illegal name binding in around cflow"
-      keywords="from-resolved_104">
-        <compile files="ArgsInCflowCf.java">
-            <message kind="error" line="19"/>
-            <message kind="error" line="29"/>
-            <message kind="error" line="35"/>
-        </compile>
-    </ajc-test>
-
     <ajc-test dir="new" pr="677"
       title="around name-binding in cflows using factorial"
       keywords="from-resolved_104">
diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index 142e7e30b..a0f890f7a 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -59,5 +59,32 @@
         </compile>
         <run class="PrivilegeBeyondScope"/>
     </ajc-test>
+    
+    <ajc-test dir="new"
+      title="incompatible advice throws clause are a compile-time error"
+      keywords="from-resolved_10x">
+        <compile files="AdviceThrowsCf.java">
+            <message kind="error" line="70"/>
+            <message kind="error" line="74"/>
+            <message kind="error" line="76"/>
+            <message kind="error" line="78"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="new"
+      title="can't apply around advice to the execution of around advice"
+      keywords="from-resolved_10x">
+        <compile files="CflowCycles.java"/>
+        <run class="CflowCycles"/>
+    </ajc-test>
+
+    <ajc-test dir="new" pr="660" title="illegal name binding in around cflow"
+      keywords="from-resolved_104">
+        <compile files="ArgsInCflowCf.java">
+            <message kind="error" line="19"/>
+            <message kind="error" line="29"/>
+            <message kind="error" line="35"/>
+        </compile>
+    </ajc-test>
 
 </suite>
diff --git a/tests/jimTests.xml b/tests/jimTests.xml
index 6c6ed6b7a..4421c26ad 100644
--- a/tests/jimTests.xml
+++ b/tests/jimTests.xml
@@ -1,84 +1,13 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
 <suite>
-    <ajc-test dir="new" title="various declared exception permutations"
-      keywords="from-resolved_10x">
-        <compile files="DeclaredExcs.java"/>
-        <run class="DeclaredExcs"/>
-    </ajc-test>
-
-       <!--
-    <ajc-test dir="base/test129"
-      title="DEPRECATED: introduce of abstract methods works"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
-    </ajc-test>
 
-    <ajc-test dir="new" title="advising field get/sets when accessing via super"
-      keywords="from-resolved_105">
-        <compile files="SuperField.java"/>
-        <run class="SuperField"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="568" title="cyclic pointcut definitions"
-      keywords="from-resolved_10rc3">
-        <compile files="CyclicPointcuts.java">
-            <message kind="error" line="11"/>
-            <message kind="error" line="14"/>
-            <message kind="error" line="18"/>
-            <message kind="error" line="32"/>
-            <message kind="error" line="43"/>
-        </compile>
-    </ajc-test>
-
-
-
-   <ajc-test dir="new" pr="457"
-      title="Compiler should suggest using aspect when advice, pointcuts, or introduction is in a class"
-      keywords="from-errors">
-        <compile files="RecognizeAspectCE.java">
-            <message kind="error" line="6"  text="RecognizeAspectCE.java:6"/>
-        </compile>
-    </ajc-test>
-
-
-    <ajc-test dir="new/privilegedAspects" pr="555"
-      title="access to private members from privileged aspect"
-      keywords="from-resolved_10rc3">
-        <compile
-          files="driver/PR555.java,util/Util.java,pack/DefaultTarget.java"/>
-        <run class="driver.PR555"/>
-    </ajc-test>
-    
-
-    <ajc-test dir="new/packageAccessPR556" pr="556"
-      title="aspects should get package access outside the file"
-      keywords="from-resolved_10rc3">
-        <compile files="base1/p/C1.java,base2/p/C2.java"/>
-        <run class="p.C1"/>
-    </ajc-test>
-    
-    <ajc-test dir="new" pr="560"
-      title="compile fails for aspect derived from percflow base aspect unless pointcut excludes base aspect and subaspects"
-      keywords="from-resolved_10rc3">
-        <compile files="PR560.java"/>
-        <run class="PR560"/>
-    </ajc-test>
-    
     <ajc-test dir="new"
-      title="Does the matrix coverage thing for the new method signatures"
-      keywords="from-resolved_10x">
-        <compile files="MethodSignatures.java"/>
-        <run class="MethodSignatures"/>
-    </ajc-test>
-    
-    <ajc-test dir="base/test117" title="DEPRECATED: introduce of variables"
-      keywords="from-base">
-        <compile files="Driver.java"/>
-        <run class="Driver"/>
+      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>
 
-
-    -->
-
 </suite>
\ No newline at end of file