ajdoc changes - moving to using a sandbox for testing, plus other bits and pieces - see pr121711 - from Helen.

3 files changed, 61 insertions, 1 deletions

diff --git a/ajdoc/testdata/coverage/foo/PlainJava.java b/ajdoc/testdata/coverage/foo/PlainJava.java
index 3c1314cb5..00ebfc12f 100644
--- a/ajdoc/testdata/coverage/foo/PlainJava.java
+++ b/ajdoc/testdata/coverage/foo/PlainJava.java
@@ -23,7 +23,7 @@ public class PlainJava {
 		return i; 
 	}
 	
-	static private class Bar {
+	static private class ClassBar {
 		
 		static private class Baz { 
 
diff --git a/ajdoc/testdata/declareForms/AnnotationTest.aj b/ajdoc/testdata/declareForms/AnnotationTest.aj
new file mode 100644
index 000000000..28a72736a
--- /dev/null
+++ b/ajdoc/testdata/declareForms/AnnotationTest.aj
@@ -0,0 +1,14 @@
+package foo;
+
+@interface MyAnnotation {	
+}
+
+public aspect AnnotationTest {
+
+	declare @type : C : @MyAnnotation;
+	
+}
+
+class C {
+	
+}
diff --git a/ajdoc/testdata/declareForms/DeclareCoverage2.aj b/ajdoc/testdata/declareForms/DeclareCoverage2.aj
new file mode 100644
index 000000000..6300298e9
--- /dev/null
+++ b/ajdoc/testdata/declareForms/DeclareCoverage2.aj
@@ -0,0 +1,46 @@
+package foo;
+
+public aspect DeclareCoverage2 {
+
+    pointcut illegalNewFigElt(): call(Point.new(..)) && !withincode(* *.doIt(..));
+    
+    declare error: illegalNewFigElt(): "Illegal constructor call.";
+    declare warning: call(* Point.setX(..)): "Illegal call.";
+
+    declare parents: Point extends java.io.Serializable;
+	declare parents: Line implements java.util.Observable;
+    declare soft: SizeException : call(* Point.getX());
+	declare precedence: DeclareCoverage2, InterTypeDecCoverage, *;
+}
+
+aspect InterTypeDecCoverage {}
+
+class Point { 
+	
+	int x = 2;
+	public void setX(int x) {
+		this.x = x;
+	}
+	
+	public int getX() {
+		return x;
+	}
+}
+
+class Line {
+}
+
+class SizeException extends Throwable { }
+
+class Main {
+	
+	public static void main(String[] args) {
+	}
+	
+	public void doIt() {
+		Point p = new Point();
+		p.setX(3);
+		p.getX();
+	}
+	
+}