Attachment #28752 for bug #113531

View | Details | Raw Unified | Return to bug 113531
Collapse All | Expand All

Lines 267-272 Link Here

(-)src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java (-1 / +8 lines)
267		267
268	static class MyErrorHandler implements ErrorHandler {	268	static class MyErrorHandler implements ErrorHandler {
269	static MyErrorHandler _instance = new MyErrorHandler();	269	static MyErrorHandler _instance = new MyErrorHandler();
		270	private List errorMessages = new ArrayList();
		271
270	private MyErrorHandler() {}	272	private MyErrorHandler() {}
271		273
272	public static ErrorHandler getInstance() {	274	public static ErrorHandler getInstance() {
Lines 279-290 Link Here
279		281
280	public void handleError(String message) {	282	public void handleError(String message) {
281	log("ErrorHandler.handleWarning("+message+")");	283	log("ErrorHandler.handleWarning("+message+")");
282		284	errorMessages.add(message);
283	}	285	}
284		286
285	public void handleError(String message, Throwable t) {	287	public void handleError(String message, Throwable t) {
286	log("ErrorHandler.handleError("+message+","+t+")");	288	log("ErrorHandler.handleError("+message+","+t+")");
287	if (VERBOSE) t.printStackTrace();	289	if (VERBOSE) t.printStackTrace();
		290	errorMessages.add(message+","+t+")");
		291	}
		292
		293	public static List/String/ getErrorMessages() {
		294	return _instance.errorMessages;
288	}	295	}
289		296
290	}	297	}




import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;
import org.aspectj.asm.AsmManager;
import org.aspectj.asm.IProgramElement;
import org.aspectj.bridge.IMessage;
import org.aspectj.testing.util.FileUtil;

/**

		build("PR111779");
	}
*/
	
	public void testPr113531() {
		initialiseProject("PR113531");
		build("PR113531");
		assertFalse("build should have compiled ok",
				MyTaskListManager.hasErrorMessages());
		alter("PR113531","inc1");
		build("PR113531");
		assertEquals("error message should be 'foo cannot be resolved' ",
				"foo cannot be resolved",
				((IMessage)MyTaskListManager.getErrorMessages().get(0))
					.getMessage());
		alter("PR113531","inc2");
		build("PR113531");
		assertTrue("There should be no exceptions handled",
				MyErrorHandler.getErrorMessages().isEmpty());		
	}

	
	// other possible tests:

Added Link Here

(-)multiIncremental/PR113531/base/src/pack1/A.aj (+7 lines)
1	package pack1;
2
3	public abstract aspect A {
4
5	protected int foo;
6
7	}

Added Link Here

(-)multiIncremental/PR113531/base/src/pack1/A1.aj (+9 lines)
1	package pack1;
2
3	public aspect A1 extends A {
4
5	private void bar () {
6	foo = 2;
7	}
8
9	}

Added Link Here

(-)multiIncremental/PR113531/inc1/src/pack1/A.aj (+7 lines)
1	package pack1;
2
3	public abstract aspect A {
4
5	private int foo;
6
7	}

Added Link Here

(-)multiIncremental/PR113531/inc2/src/pack1/A3.aj (+5 lines)
1	package pack1;
2
3	public aspect A3 {
4
5	}

Return to bug 113531

Lines 23-28 Link Here

(-)src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java (+18 lines)
23	import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;	23	import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;
24	import org.aspectj.asm.AsmManager;	24	import org.aspectj.asm.AsmManager;
25	import org.aspectj.asm.IProgramElement;	25	import org.aspectj.asm.IProgramElement;
		26	import org.aspectj.bridge.IMessage;
26	import org.aspectj.testing.util.FileUtil;	27	import org.aspectj.testing.util.FileUtil;
27		28
28	/**	29	/**
Lines 296-301 Link Here
296	build("PR111779");	297	build("PR111779");
297	}	298	}
298	*/	299	*/
		300
		301	public void testPr113531() {
		302	initialiseProject("PR113531");
		303	build("PR113531");
		304	assertFalse("build should have compiled ok",
		305	MyTaskListManager.hasErrorMessages());
		306	alter("PR113531","inc1");
		307	build("PR113531");
		308	assertEquals("error message should be 'foo cannot be resolved' ",
		309	"foo cannot be resolved",
		310	((IMessage)MyTaskListManager.getErrorMessages().get(0))
		311	.getMessage());
		312	alter("PR113531","inc2");
		313	build("PR113531");
		314	assertTrue("There should be no exceptions handled",
		315	MyErrorHandler.getErrorMessages().isEmpty());
		316	}
299		317
300		318
301	// other possible tests:	319	// other possible tests: