234933: test and partial fix, just for adviceDidNotMatch so far.

diff --git a/tests/bugs161/pr234933/Foobar.java b/tests/bugs161/pr234933/Foobar.java
new file mode 100644 (file)
index 0000000..1d3071d
--- /dev/null
+++ b/tests/bugs161/pr234933/Foobar.java
@@ -0,0 +1,8 @@
+package p1;
+
+import org.aspectj.lang.annotation.SuppressAjWarnings;
+
+@SuppressAjWarnings
+public aspect Foobar {
+  before(): execution(* *(..)) {}
+}

diff --git a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
index 94c28eaabf90330c75caab17dfc153723a06cd0f..c5bbb14dfd9a86895573c1a35b3b09d6b7f014b2 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
@@ -22,7 +22,8 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        
-       // AspectJ1.6.1
+       // AspectJ1.6.1 
+       public void testIgnoringTypeLevelSuppression_pr234933() { runTest("ignoring type level suppress");}
        public void testDuplicateMethodSignature_pr223226_2() { runTest("duplicate method signature - 2"); }
        public void testDuplicateMethodSignature_pr223226() { runTest("duplicate method signature"); }
        public void testProtectedMethodsAroundAdvice_pr197719_2() { runTest("protected methods and around advice - again - 2");}

diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
index 5ecf573707b62fc75bdc352ae9fc03a72dd73644..c34a46444c799b7a691e741aed053abdcbf150b5 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
+++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
@@ -3,6 +3,10 @@
 <!-- AspectJ v1.6.1 Tests -->
 <suite>
 
+       <ajc-test dir="bugs161/pr234933" title="ignoring type level suppress">
+       <compile files="Foobar.java" options="-1.5 -Xlint:error"/>
+    </ajc-test>
+    
        <ajc-test dir="bugs161/pr223226" title="duplicate method signature - 2">
        <compile files="AspectX.java BInterface.java FooInterface.java AspectXMarker.java Foo.java Test.java" options="-1.5"/>
        <run class="Test"/>