Revised and added tests for ASM containment hierarchy.

2 files changed, 42 insertions, 13 deletions

diff --git a/ajde/testdata/examples/coverage/ModelCoverage.java b/ajde/testdata/examples/coverage/ModelCoverage.java
index 81891abed..6fa3255d6 100644
--- a/ajde/testdata/examples/coverage/ModelCoverage.java
+++ b/ajde/testdata/examples/coverage/ModelCoverage.java
@@ -15,6 +15,11 @@ class Point {
 	
 	public void setX(int x) { this.x = x; }
 	
+	public int changeX(int x) { 
+		this.x = x;
+		return x;
+	}
+	
 	void doIt() { 
 		try {
 			File f = new File(".");
@@ -27,6 +32,10 @@ class Point {
 	}
 } 
 
+class SubPoint extends Point { }
+
+class Line { }
+
 aspect AdvisesRelationCoverage {
     before(): execution(*..*.new(..)) { }
     before(): get(int *.*) { }
@@ -40,27 +49,47 @@ aspect AdvisesRelationCoverage {
     before(): within(*) && execution(Point.new()) { }
 }
 
+aspect AdviceNamingCoverage {
+	pointcut named(): call(* *.mumble());
+	pointcut namedWithOneArg(int i): call(int Point.changeX(int)) && args(i);
+	pointcut namedWithArgs(int i, int j): set(int Point.x) && args(i, j);
+
+	after(): named() { }	
+	after(int i, int j) returning: namedWithArgs(i, j) { }
+	after() throwing: named() { }
+	after(): named() { }
+	
+	before(): named() { }
+	
+	int around(int i): namedWithOneArg(i) { return i;}
+	int around(int i) throws SizeException: namedWithOneArg(i) { return proceed(i); }
+	
+	before(): named() { }	
+	
+	before(): call(* *.mumble()) { }
+  
+}
+  
 aspect InterTypeDecCoverage {
 
     pointcut illegalNewFigElt(): call(Point.new(..)) && !withincode(* *.doIt(..));
 
-    declare error: illegalNewFigElt():
-	    "Illegal figure element constructor call.";
-
-    declare warning: illegalNewFigElt():
-	    "Illegal figure element constructor call.";
+    declare error: illegalNewFigElt(): "Illegal constructor call.";
+    declare warning: illegalNewFigElt(): "Illegal constructor call.";
 
     declare parents: Point extends java.io.Serializable;
-
-    declare parents: Point implements java.util.Observable;
-
-    //declare soft: Point: call(* *(..));
-
-    public String Point.getName() { return "xxx"; }
-
-    public int Point.xxx = 0; 
+    declare parents: Point+ implements java.util.Observable;
+	declare parents: Point && Line implements java.util.Observable;
+    declare soft: SizeException : call(* Point.getX());
+	declare precedence: AdviceCoverage, InterTypeDecCoverage, *;
+
+	public int Point.xxx = 0;
+    public int Point.check(int i, Line l) { return 1 + i; }
+//	public Line.new(String s) {  }
 }
 
+class SizeException extends Exception { } 
+
 aspect AdviceCoverage {
 
 }
diff --git a/ajde/testdata/examples/coverage/coverage.ajsym b/ajde/testdata/examples/coverage/coverage.ajsym
index 775161e48..324199378 100644
--- a/ajde/testdata/examples/coverage/coverage.ajsym
+++ b/ajde/testdata/examples/coverage/coverage.ajsym