Updated with suppression attribute for non-matching advice.

3 files changed, 11 insertions, 11 deletions

diff --git a/tests/java5/annotations/AnnotationAspect02.aj b/tests/java5/annotations/AnnotationAspect02.aj
index ddc3cc48d..00bb10941 100644
--- a/tests/java5/annotations/AnnotationAspect02.aj
+++ b/tests/java5/annotations/AnnotationAspect02.aj
@@ -1,5 +1,5 @@
 public aspect AnnotationAspect02 {

-  before(): call(@SimpleAnnotation * *(..)) {}

+  @org.aspectj.lang.annotation.SuppressAjWarnings before(): call(@SimpleAnnotation * *(..)) {}

 

-  before(): call( * *(..)) {}

+  @org.aspectj.lang.annotation.SuppressAjWarnings before(): call( * *(..)) {}

 }

diff --git a/tests/java5/annotations/args/AtArgsAspect.java b/tests/java5/annotations/args/AtArgsAspect.java
index 5a5c8a4f7..010808ef0 100644
--- a/tests/java5/annotations/args/AtArgsAspect.java
+++ b/tests/java5/annotations/args/AtArgsAspect.java
@@ -9,14 +9,14 @@ public aspect AtArgsAspect {
 		System.out.print("@args(*,*,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(*,*,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(*,*,*,*,*) {
 		System.out.print("@args(*,*,*,*,*): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
 	
 	// One too few
 	// test 1
-	before() : myMethod() && @args(*,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && @args(*,*,*,*) {
 		System.out.print("@args(*,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -27,7 +27,7 @@ public aspect AtArgsAspect {
 	
 	// One too many
 	// test 2
-	before() : myMethod() && @args(*,*,*,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && @args(*,*,*,*,*,*) {
 		System.out.print("@args(*,*,*,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -42,7 +42,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(*,*,..,*,*,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(*,*,..,*,*,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(*,*,..,*,*,*) {
 		System.out.print("@args(*,*,..,*,*,*): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -53,7 +53,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(*,*,*,..): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(*,*,*,..) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(*,*,*,..) {
 		System.out.print("@args(*,*,*,..): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -97,7 +97,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(..,@MyInheritableAnnotation,*): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(..,@MyInheritableAnnotation,*) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(..,@MyInheritableAnnotation,*) {
 		System.out.print("@args(..,@MyInheritableAnnotation,*): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -107,7 +107,7 @@ public aspect AtArgsAspect {
 		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
 		System.out.println(TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
-	before() : myMethod() && !@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation) {
+	@org.aspectj.lang.annotation.SuppressAjWarnings before() : myMethod() && !@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation) {
 		System.out.print("@args(..,@MyInheritableAnnotation,@MyInheritableAnnotation): ");
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
@@ -122,4 +122,4 @@ public aspect AtArgsAspect {
 		System.out.println(!TestingArgsAnnotations.expected() ? "PASS" : "FAIL");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/java5/annotations/binding/complexExample/X4.java b/tests/java5/annotations/binding/complexExample/X4.java
index edfb63ef1..de910fe0f 100644
--- a/tests/java5/annotations/binding/complexExample/X4.java
+++ b/tests/java5/annotations/binding/complexExample/X4.java
@@ -3,7 +3,7 @@ import a.b.c.A;
 public aspect X4 {
 
   // Error as Color not imported
-  before(A a): execution(@Color * A+.*(..)) && this(a) {
+  @org.aspectj.lang.annotation.SuppressAjWarnings before(A a): execution(@Color * A+.*(..)) && this(a) {
     System.err.println("Before call to "+thisJoinPoint);
   }