new harness tests

- inc-compile "fresh" attribute and "same" tag
- compile "reuseCompiler" attribute

diff --git a/tests/ajcHarnessTests.xml b/tests/ajcHarnessTests.xml
index 6705233e79c94bcab0f590b2b844a3577fffec2c..d4b370080ce0b879c82cb9c27e7cb696b5ae2ac0 100644 (file)
--- a/tests/ajcHarnessTests.xml
+++ b/tests/ajcHarnessTests.xml
@@ -9,6 +9,7 @@
      Also pick out "incremental" keyword for incremental tests.
 -->
 <suite>
+
     <ajc-test dir="noSuchDir"
       title="no such directory - report as error (AjcTest specification)"
      keywords="expect-fail">
@@ -133,7 +134,6 @@
         <run class="AspectMain"/>
     </ajc-test>
 
-       <!-- testing incremental support -->
     <ajc-test dir="harness"  keywords="incremental"
                title="minimal purejava sourceroots test">
         <compile sourceroots="sourceroot"/>
@@ -147,14 +147,61 @@
     </ajc-test>
 
     <ajc-test dir="harness"  keywords="incremental"
-               title="minimal incremental purejava sourceroots test">
+               title="minimal incremental purejava sourceroots test"
+       comment="inc-22 generates new event, expected after">
+        <compile options="-incremental" 
+               sourceroots="sourceroot-inc"/>
+               <run class="packageOne.Main"/>
+        <inc-compile tag="22"/> 
+               <run class="packageOne.Main" 
+                  options="new-event"/>
+    </ajc-test>
+
+    <ajc-test dir="harness"  keywords="incremental"
+               title="rebuild minimal incremental purejava sourceroots test"
+       comment="inc-22 generates new event, expected after">
+        <compile options="-incremental" 
+               sourceroots="sourceroot-inc"/>
+               <run class="packageOne.Main"/>
+        <inc-compile tag="22"/>
+               <run class="packageOne.Main" 
+                  options="new-event"/> 
+
+        <compile options="-incremental" 
+            reuseCompiler="true"
+               sourceroots="sourceroot-inc"/>
+               <run class="packageOne.Main"/>
+        <inc-compile tag="22"/>
+               <run class="packageOne.Main" 
+                  options="new-event"/>
+    </ajc-test>
+    
+    <ajc-test dir="harness"  keywords="incremental"
+               title="rebuild fresh-same minimal incremental purejava sourceroots test"
+       comment="inc-22 generates new event, expected after">
         <compile options="-incremental" 
                sourceroots="sourceroot-inc"/>
                <run class="packageOne.Main"/>
-        <inc-compile tag="22"/> <!-- generates new-event -->
+        <inc-compile tag="22"/> 
+               <run class="packageOne.Main" 
+                  options="new-event"/> 
+
+        <inc-compile tag="same" fresh="true" />
                <run class="packageOne.Main" 
                   options="new-event"/> <!-- now expect new-event -->
     </ajc-test>
+    
+    <ajc-test dir="harness"  keywords="incremental"
+               title="rebuild fresh-updated minimal incremental purejava sourceroots test"
+       comment="inc-22 generates new event, expected after">
+        <compile options="-incremental" 
+               sourceroots="sourceroot-inc"/>
+               <run class="packageOne.Main"/>
+
+        <inc-compile tag="22" fresh="true" /> 
+               <run class="packageOne.Main" 
+                  options="new-event"/> 
+    </ajc-test>
 
     <ajc-test dir="incremental/stringliteral"  
                title="incrementally change only string literal size">