test for pr84033 promoted from failing suite to real suite.

6 files changed, 38 insertions, 9 deletions

diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index c109cf188..6778764c6 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -153,13 +153,4 @@
         <run class="Test_AroundVarBug"/>
     </ajc-test>
 
-    <ajc-test dir="bugs/incremental-declare-error" pr="84033"
-   	 title="incremental declare error persists after fix">
-        <compile files="pack/Aspect.java,pack/Main.java">
-			<message kind="error" line="6" text="main"/>
-			</compile>
-        <inc-compile tag="20"/>
-        <run class="pack.Main"/>
-    </ajc-test>
-
 </suite>
diff --git a/tests/bugs/incremental-declare-error/changes/Aspect.20.java b/tests/bugs/incremental-declare-error/changes/Aspect.20.java
new file mode 100644
index 000000000..ec9f72da5
--- /dev/null
+++ b/tests/bugs/incremental-declare-error/changes/Aspect.20.java
@@ -0,0 +1,6 @@
+
+package pack;
+
+public aspect Aspect {
+    declare error : execution(private static void Main.main(String[])) : "main";
+}
\ No newline at end of file
diff --git a/tests/bugs/incremental-declare-error/src/pack/Aspect.java b/tests/bugs/incremental-declare-error/src/pack/Aspect.java
new file mode 100644
index 000000000..f3aa00547
--- /dev/null
+++ b/tests/bugs/incremental-declare-error/src/pack/Aspect.java
@@ -0,0 +1,6 @@
+
+package pack;
+
+public aspect Aspect {
+    declare error : execution(public static void Main.main(String[])) : "main";
+}
\ No newline at end of file
diff --git a/tests/bugs/incremental-declare-error/src/pack/Main.java b/tests/bugs/incremental-declare-error/src/pack/Main.java
new file mode 100644
index 000000000..079b05d14
--- /dev/null
+++ b/tests/bugs/incremental-declare-error/src/pack/Main.java
@@ -0,0 +1,8 @@
+
+package pack;
+
+/** @testcase PR#84033 incremental declare error persists after fix */
+public class Main {
+    public static void main(String[] args) {  // CE 6 on first pass, not second
+    }
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
index d4a4f62f2..7294c54cb 100644
--- a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
@@ -256,5 +256,12 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	    copyFileAndDoIncrementalBuild("changes/X.20.aj","src/X.aj");
   }
   
+  public void testPersistingDeow_pr84033() throws Exception {
+	  runTest("incremental declare error persists after fix");
+	  copyFileAndDoIncrementalBuild("changes/Aspect.20.java", "src/pack/Aspect.java");
+      nextIncrement(true);
+	  RunResult before = run("pack.Main");
+  }
+  
 }
 
diff --git a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
index b16dd107e..794a63dd3 100644
--- a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
+++ b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
@@ -377,4 +377,15 @@
         <compile staging="true"	options="-incremental,-verbose,-emacssym" sourceroots="src"/>
         <!--inc-compile tag="20"/-->
     </ajc-test>
+    	 
+   <ajc-test dir="bugs/incremental-declare-error" pr="84033"
+   	 title="incremental declare error persists after fix">
+        <compile staging="true" 
+        	options="-incremental,-verbose"
+        	sourceroots="src">
+			<message kind="error" line="6" text="main"/>
+		</compile>
+        <!--inc-compile tag="20"/-->
+        <!--run class="pack.Main"/-->
+    </ajc-test>
 	
\ No newline at end of file