256458: test and fix: better message for if() pointcut anno style problems

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index cc5e25a6cf11d7c83fc604c7eb9d353692a4aa4b..a461b9263e35893f7f0c8f6cc32826553354e887 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -28,10 +28,26 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
-//     public void testAtAspectJDecp_pr164016() {
-//             runTest("ataspectj decp");
-//     }
+       // public void testAtAspectJDecp_pr164016() {
+       // runTest("ataspectj decp");
+       // }
+
+       public void testPoorAtAjIfMessage_pr256458() {
+               runTest("poor ataj if message - 1");
+       }
 
+       public void testPoorAtAjIfMessage_pr256458_2() {
+               runTest("poor ataj if message - 2");
+       }
+/*
+       public void testInheritedAnnotations_pr128664() {
+               runTest("inherited annotations");
+       }
+
+       public void testInheritedAnnotations_pr128664_2() {
+               runTest("inherited annotations - 2");
+       }
+*/
        public void testGetMethodNull_pr154427() {
                runTest("getMethod returning null");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index 065123ea5eb7867d61dc85c9171dbe0b05747eeb..11c89c64f09f2a1ea581cce691b1833906ededcc 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -19,6 +19,32 @@
          </run>
     </ajc-test>
     
+    <ajc-test dir="bugs163/pr128664" title="inherited annotations">
+         <compile files="Bug.java" options="-1.5 -showWeaveInfo">
+           <message kind="weave" text=""/>
+         </compile>
+         <run class="Bug"/>
+    </ajc-test>
+        
+    <ajc-test dir="bugs163/pr128664" title="inherited annotations - 2">
+         <compile files="Bug2.java" options="-1.5 -showWeaveInfo">
+           <message kind="weave" text=""/>
+         </compile>
+         <run class="Bug2"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs163/pr256458" title="poor ataj if message - 1">
+         <compile files="Code.java" options="-1.5">
+           <message kind="error" text="in annotation style, if(...) pointcuts cannot contain code"/>
+         </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs163/pr256458" title="poor ataj if message - 2">
+         <compile files="Code2.java" options="-1.5">
+           <message kind="error" text="in annotation style, if(...) pointcuts cannot contain code"/>
+         </compile>
+    </ajc-test>
+
     <ajc-test dir="bugs163/pr256937" title="fully qualified return type">
          <compile files="Ship.java ShipAccessor.java" options="-emacssym -1.5"/>
     </ajc-test>