test and fix for 112736

3 files changed, 15 insertions, 15 deletions

diff --git a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
index 7294c54cb..9be1dbd4c 100644
--- a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
@@ -14,8 +14,8 @@ import java.util.List;
 
 import junit.framework.Test;
 
+import org.aspectj.ajdt.internal.core.builder.AbstractStateListener;
 import org.aspectj.ajdt.internal.core.builder.AjState;
-import org.aspectj.ajdt.internal.core.builder.IStateListener;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
@@ -112,7 +112,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
    * being on the classpath.  This test verifies the fix is OK
    */
   public void testIncrementalOKWithOutputPathOnClasspath() throws Exception {
-	  class MyStateListener implements IStateListener {
+	  class MyStateListener extends AbstractStateListener {
   	    public boolean pathChange = false;
 		public void pathChangeDetected() {pathChange = true;}
 		public void aboutToCompareClasspaths(List oldClasspath, List newClasspath) {}
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
index 118d54211..f7a1ef17e 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
@@ -29,8 +29,8 @@ import org.aspectj.ajde.BuildProgressMonitor;
 import org.aspectj.ajde.ErrorHandler;
 import org.aspectj.ajde.ProjectPropertiesAdapter;
 import org.aspectj.ajde.TaskListManager;
+import org.aspectj.ajdt.internal.core.builder.AbstractStateListener;
 import org.aspectj.ajdt.internal.core.builder.AjState;
-import org.aspectj.ajdt.internal.core.builder.IStateListener;
 import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;
 import org.aspectj.asm.AsmManager;
 import org.aspectj.bridge.IMessage;
@@ -694,7 +694,7 @@ public class AjdeInteractionTestbed extends TestCase {
 		}
 	}
 	
-	static class MyStateListener implements IStateListener {
+	static class MyStateListener extends AbstractStateListener {
 		
 		private static MyStateListener _instance = new MyStateListener();
 		private MyStateListener() {reset();}
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 075840131..df3255e7d 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -368,17 +368,17 @@ public class MultiProjectIncrementalTests extends AjdeInteractionTestbed {
 					.getMessage());
 	}
 
-//	public void testPr112736() {
-//		AjdeInteractionTestbed.VERBOSE = true;
-//		initialiseProject("PR112736");
-//		build("PR112736");
-//		checkWasFullBuild();
-//		String fileC2 = getWorkingDir().getAbsolutePath() + File.separatorChar + "PR112736" + File.separatorChar + "src" + File.separatorChar + "pack" + File.separatorChar + "A.java";
-//		(new File(fileC2)).delete();
-//		alter("PR112736","inc1");
-//		build("PR112736");
-//		checkWasntFullBuild();
-//	}
+	public void testPr112736() {
+		AjdeInteractionTestbed.VERBOSE = true;
+		initialiseProject("PR112736");
+		build("PR112736");
+		checkWasFullBuild();
+		String fileC2 = getWorkingDir().getAbsolutePath() + File.separatorChar + "PR112736" + File.separatorChar + "src" + File.separatorChar + "pack" + File.separatorChar + "A.java";
+		(new File(fileC2)).delete();
+		alter("PR112736","inc1");
+		build("PR112736");
+		checkWasFullBuild();
+	}
 	
 	
 	// other possible tests: