Modified test to account for additional "uses pointcut" relationships.

diff --git a/tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java b/tests/src/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
index b9d01431af1233a4974fbfc261af3a79ea42cdeb..d4a8e7c487ff39fcece4a1a87035e3bafd7d9938 100644 (file)
--- 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);