From a2f209561e3f3cfb607bfc4e24ada88aa6379a05 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Sat, 6 Dec 2008 05:12:43 +0000
Subject: [PATCH] 257754: decp anno: test and fix

---
 tests/src/org/aspectj/systemtest/ajc150/ajc150.xml  |  6 ++++--
 .../org/aspectj/systemtest/ajc163/Ajc163Tests.java  | 10 +++++++---
 tests/src/org/aspectj/systemtest/ajc163/ajc163.xml  | 13 ++++++++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 1e878b860..42c90f838 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -194,7 +194,7 @@
     
     <ajc-test dir="java5/decps" title="decps - 3c">
      <compile files="Basic3c.java" options="-1.5">
-       <message kind="error" text="@DeclareParents: defaultImpl=&quot;X$IImpl&quot; has no public no-arg constructor"/>
+       <message kind="error" text="@DeclareParents: defaultImpl=&quot;X$IImpl&quot; has a no argument constructor, but it is of incorrect visibility"/>
 	 </compile>
     </ajc-test>  
         
@@ -1086,7 +1086,9 @@
     </ajc-test>
         
     <ajc-test dir="bugs150" title="(@Foo *)+ type pattern parse error">
-        <compile files="AnnotationPlusPatternParseError.aj" options="-1.5"/>
+        <compile files="AnnotationPlusPatternParseError.aj" options="-1.5">
+          <message kind="warning" line="19"/>
+        </compile>
     </ajc-test>
 
     <ajc-test dir="bugs150" pr="80571" title="around advice on interface initializer">
diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index 1f33e5792..a403dffa3 100644
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -54,9 +54,13 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("incorrect arg ordering anno style - 5");
 	}
 
-	// public void testDecpAnnoStyle_pr257754() {
-	// runTest("decp anno style");
-	// }
+	public void testDecpAnnoStyle_pr257754() {
+		runTest("decp anno style");
+	}
+
+	public void testDecpAnnoStyle_pr257754_2() {
+		runTest("decp anno style - 2");
+	}
 
 	public void testPoorAtAjIfMessage_pr256458() {
 		runTest("poor ataj if message - 1");
diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index 7a07dff4a..eb1034a60 100644
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -35,7 +35,18 @@
     
     <ajc-test dir="bugs163/pr257754" title="decp anno style">
    	  <compile files="Main.java" options="-1.5"/>
-   	  <run class="example.Main"/>
+   	  <run class="example.Main">
+   	  <stdout>
+   	  <line text="In doFoo class example.DefaultFoo"/>
+   	  <line text="Bar"/>
+   	  </stdout>
+   	  </run>
+    </ajc-test>
+    
+    <ajc-test dir="bugs163/pr257754" title="decp anno style - 2">
+   	  <compile files="Main2.java Foo.java DefaultFoo.java" options="-1.5">
+   	  <message kind="error" text="but it is of incorrect visibility"/>
+   	  </compile>
     </ajc-test>
     
     <ajc-test dir="bugs163/pr219419" title="incorrect arg ordering anno style">
-- 
2.39.5