262905: recursive non matching cflow pointcut: test and fix

diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index 2af9fd2acaa2e2d10f8de2873073b86523bcee73..0752ebeaae0f3f9e568465ce8a1baab3f581bc2f 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -24,10 +24,18 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testRecursiveCflow() {
+               runTest("recursive cflow");
+       }
+
+       //public void testAopConfig1() {
+       //      runTest("aop config - 1");
+       //}
+
        public void testAnnoDecprecedence_pr256779() {
                runTest("anno decprecedence");
-       }       
-       
+       }
+
        // 
        public void testBrokenLVT_pr194314_1() throws Exception {
                runTest("broken lvt - 1");

diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index f2ff1af9e25b48e8bbc1aff8f3a77cc213e72441..1ddce0bb4229e6bac65a30100bd833b80d798a8e 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,13 +2,24 @@
 
 <suite>
     
+    <ajc-test dir="features164/aopconfig/one" title="aop config - 1">
+      <compile files="A.java A2.java B.java foo.xml" options="-1.5 -showWeaveInfo">
+        <message kind="weave" text="goo"/>
+      </compile>
+    </ajc-test>
+    
     <ajc-test dir="bugs164/pr256779" title="anno decprecedence">
       <compile files="ThisAspect.java OtherAspect.java" options="-1.5"/>
       <run class="com.ThisAspect" ltw="aop.xml"/>
-      
     </ajc-test>
     
-
+    <ajc-test dir="bugs164/pr262905" title="recursive cflow">
+      <compile files="A.java" options="-1.5">
+        <message kind="warning" line="5" text="advice defined"/>
+        <message kind="error" line="3" text="circular"/>
+      </compile>
+    </ajc-test>
+    
     <ajc-test dir="bugs164/pr194314" title="broken lvt - 1">
       <compile files="Service.java IService.java Main.java ServiceInterceptor.java" options="-1.5"/>
     </ajc-test>