summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten <mkersten>2004-10-15 15:55:33 +0000
committermkersten <mkersten>2004-10-15 15:55:33 +0000
commit6be5440fdfa1f75d3754dc4be9269ecff4ead609 (patch)
treef82f22275e2822caa9cb03c27e29a45d6adf96e4
parentc5ac111c5b5cc2a17d9d094eb7c0032940a4f2ff (diff)
downloadaspectj-6be5440fdfa1f75d3754dc4be9269ecff4ead609.tar.gz
aspectj-6be5440fdfa1f75d3754dc4be9269ecff4ead609.zip
Modified test to account for additional "uses pointcut" relationships.
-rw-r--r--tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java b/tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
index b9d01431a..d4a8e7c48 100644
--- a/tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
@@ -58,17 +58,17 @@ public class IncrementalModelTests extends org.aspectj.testing.XMLBasedAjcTestCa
// <!-- BetaA has a new piece of handler advice added -->
nextIncrement(true);
copyFileAndDoIncrementalBuild("changes/primary/BetaA.20.java","src/primary/BetaA.java");
- StructureModelUtil.checkModel("code=1,advice=1,RelationshipMapSize=2");
+ StructureModelUtil.checkModel("code=1,advice=1,RelationshipMapSize=3");
// <!-- secondary.GammaA added, also advises the same handler -->
nextIncrement(true);
copyFileAndDoIncrementalBuild("changes/secondary/GammaA.30.java","src/secondary/GammaA.java");
- StructureModelUtil.checkModel("code=1,advice=2,RelationshipMapSize=3");
+ StructureModelUtil.checkModel("code=1,advice=2,RelationshipMapSize=5");
// <!-- primary.BetaA deleted -->
nextIncrement(true);
deleteFileAndDoIncrementalBuild("src/primary/BetaA.java");
- StructureModelUtil.checkModel("code=1,advice=1,RelationshipMapSize=2");
+ StructureModelUtil.checkModel("code=1,advice=1,RelationshipMapSize=3");
}
@@ -79,12 +79,12 @@ public class IncrementalModelTests extends org.aspectj.testing.XMLBasedAjcTestCa
// <!-- BetaA has a new piece of advice added -->
nextIncrement(true);
copyFileAndDoIncrementalBuild("changes/primary/BetaA.20.java","src/primary/BetaA.java");
- StructureModelUtil.checkModel("code=2,advice=2,java source file=3,RelationshipMapSize=4");
+ StructureModelUtil.checkModel("code=2,advice=2,java source file=3,RelationshipMapSize=6");
// <!-- BetaA has a piece of advice removed -->
nextIncrement(true);
copyFileAndDoIncrementalBuild("changes/primary/BetaA.30.java","src/primary/BetaA.java");
- StructureModelUtil.checkModel("code=1,advice=1,RelationshipMapSize=2");
+ StructureModelUtil.checkModel("code=1,advice=1,RelationshipMapSize=3");
// <!-- BetaA other piece of advice removed (now empty) -->
nextIncrement(true);