aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2006-09-14 14:54:37 +0000
committeraclement <aclement>2006-09-14 14:54:37 +0000
commit478d55f8bd604ee7a652c8be5012ec531da04308 (patch)
treed25c7951a5f0a24a7ca72f86e7dd6f9c1d373811
parent9a4f0495f37f6637578724c4e5aed87f9fcb4674 (diff)
downloadaspectj-478d55f8bd604ee7a652c8be5012ec531da04308.tar.gz
aspectj-478d55f8bd604ee7a652c8be5012ec531da04308.zip
Test for 157057
-rw-r--r--tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java19
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedType.java2
2 files changed, 20 insertions, 1 deletions
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 43c4bf3a5..900033e2e 100644
--- 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 e13776568..b80992f71 100644
--- 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;