From 7341d0ef49091ce7ea2b671672cdec5f6583743a Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Fri, 5 Dec 2008 18:41:40 +0000
Subject: [PATCH] 256458: test and fix: better message for if() pointcut anno
 style problems

---
 .../systemtest/ajc163/Ajc163Tests.java        | 22 +++++++++++++---
 .../org/aspectj/systemtest/ajc163/ajc163.xml  | 26 +++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index cc5e25a6c..a461b9263 100644
--- 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 065123ea5..11c89c64f 100644
--- 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>
-- 
2.39.5