### Eclipse Workspace Patch 1.0 #P tests Index: src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java =================================================================== RCS file: /cvsroot/tools/org.aspectj/modules/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java,v retrieving revision 1.70 diff -u -r1.70 MultiProjectIncrementalTests.java --- src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java 22 Sep 2006 10:49:39 -0000 1.70 +++ src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java 25 Sep 2006 10:32:08 -0000 @@ -260,6 +260,21 @@ } */ + public void testPr148285() { + initialiseProject("PR148285_2"); + build("PR148285_2"); + alter("PR148285_2","inc1"); + build("PR148285_2"); + assertEquals("error message should be 'The type C is already defined' ", + "The type C is already defined", + ((IMessage)MyTaskListManager.getErrorMessages().get(0)) + .getMessage()); + alter("PR148285_2","inc2"); + build("PR148285_2"); + assertTrue("There should be no errors reported:\n"+MyTaskListManager.getErrorMessages(), + MyTaskListManager.getErrorMessages().isEmpty()); + } + /** * In order for this next test to run, I had to move the weaver/world pair we keep in the Index: multiIncremental/PR148285_2/base/A.aj =================================================================== RCS file: multiIncremental/PR148285_2/base/A.aj diff -N multiIncremental/PR148285_2/base/A.aj --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multiIncremental/PR148285_2/base/A.aj 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,11 @@ +public aspect A { + + before() : execution(* *.*(..)) {} + +} + +class C { + + public void m() {} + +} Index: multiIncremental/PR148285_2/inc2/A.aj =================================================================== RCS file: multiIncremental/PR148285_2/inc2/A.aj diff -N multiIncremental/PR148285_2/inc2/A.aj --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multiIncremental/PR148285_2/inc2/A.aj 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,11 @@ +public aspect A { + + before() : execution(* *.*(..)) {} + +} + +//class C { +// +// public void m() {} +// +//} Index: multiIncremental/PR148285_2/inc1/C.java =================================================================== RCS file: multiIncremental/PR148285_2/inc1/C.java diff -N multiIncremental/PR148285_2/inc1/C.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ multiIncremental/PR148285_2/inc1/C.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,5 @@ +public class C { + + public void m() {} + +}