Test for 157057

diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 43c4bf3a55be9d99fd4a48c9f6f6bb076a0b23cf..900033e2e05c0b9df135e596625e04aef2525a65 100644 (file)
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -645,6 +645,25 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
                build("PR115251");
                checkWasFullBuild();  // back to the source
        }
+
+       public void testPr157054() {
+               configureBuildStructureModel(true);
+               MyBuildOptionsAdapter.setNonStandardOptions("-showWeaveInfo");
+               initialiseProject("PR157054");
+               build("PR157054");
+               checkWasFullBuild();
+               List weaveMessages = MyTaskListManager.getWeavingMessages();
+               assertTrue("Should be two weaving messages but there are "+weaveMessages.size(),weaveMessages.size()==2);
+               alter("PR157054","inc1");
+               build("PR157054");
+               weaveMessages = MyTaskListManager.getWeavingMessages();
+               assertTrue("Should be three weaving messages but there are "+weaveMessages.size(),weaveMessages.size()==3);
+               checkWasntFullBuild();
+               fullBuild("PR157054");
+               weaveMessages = MyTaskListManager.getWeavingMessages();
+               assertTrue("Should be three weaving messages but there are "+weaveMessages.size(),weaveMessages.size()==3);
+       }
+       
        
 
        /**

diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index e137765680468b433b8037c0ca88412bffc39644..b80992f71e46c2088f0c817671859c2169cb31c4 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -36,7 +36,7 @@ import org.aspectj.weaver.patterns.PerClause;
 
 public abstract class ResolvedType extends UnresolvedType implements AnnotatedElement {
 
-       private static final ResolvedType[] EMPTY_RESOLVED_TYPE_ARRAY  = new ResolvedType[0];
+       public static final ResolvedType[] EMPTY_RESOLVED_TYPE_ARRAY  = new ResolvedType[0];
        public static final String PARAMETERIZED_TYPE_IDENTIFIER = "P";
        
        private ResolvedType[] resolvedTypeParams;