333274: more tests and fixes: nested @Around advice with proceed

5 files changed, 56 insertions, 16 deletions

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index d974123ee..8f44cfa59 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -103,17 +103,17 @@ public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("pr328840");
 	}
 
-	// public void testAnnoStyleAdviceChain_333274() {
-	// runTest("anno style advice chain");
-	// }
-	//
-	// public void testAnnoStyleAdviceChain_333274_2() {
-	// runTest("code style advice chain");
-	// }
-	//
-	// public void testAnnoStyleAdviceChain_333274_3() {
-	// runTest("code style advice chain - no inline");
-	// }
+	 public void testAnnoStyleAdviceChain_333274() {
+		 runTest("anno style advice chain");
+	 }
+	
+	 public void testAnnoStyleAdviceChain_333274_2() {
+		 runTest("code style advice chain");
+	 }
+	
+	 public void testAnnoStyleAdviceChain_333274_3() {
+		 runTest("code style advice chain - no inline");
+	 }
 
 	// ---
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java
index 1199db262..6a52df395 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/Ajc193Tests.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
-package org.aspectj.systemtest.ajc193;
+package org.aspectj.systemtest.ajc193; 
 
 import java.io.File;
 
@@ -18,9 +18,13 @@ import junit.framework.Test;
 
 /**
  * @author Andy Clement
- */
+ */ 
 public class Ajc193Tests extends XMLBasedAjcTestCaseForJava10OrLater {
 
+	public void testNestedAroundProceed() {
+		runTest("nested around proceed");
+	}
+
 	public void testDeclareMixinOverweavingControl() {
 		runTest("overweaving decm - control");
 	}
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1611/ajc1611.xml
index beb922924..1f42edfd6 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -117,7 +117,7 @@
   </ajc-test>
   
   <ajc-test dir="bugs1611/pr333274" title="code style advice chain">
-  <compile files="ma2/Annotation1.java  ma2/aspect1/Aspect1.java  ma2/aspect3/Aspect3.java ma2/Main.java ma2/Precedence.java" options="-1.5 "/>
+  <compile files="ma2/Annotation1.java  ma2/aspect1/Aspect1.java  ma2/aspect3/Aspect3.java ma2/Main.java ma2/Precedence.java" options="-1.5 -XnoInline"/>
   <run class="ma2.Main">
   <stdout>
   <line text="&gt;In Aspect1"/>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190.xml
index d6507dace..2936888cb 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190.xml
@@ -77,8 +77,8 @@
   </ajc-test>
 
   <ajc-test dir="bugs190/modules/fff" title="compile module including aspects">
-    <compile files="module-info.java pkg/Demo.java otherpkg/Azpect.java" modulepath="$runtime" outjar="demomodule.jar" options="-1.9"/>
-    <run modulepath="$runtime:demomodule.jar" module="demo/pkg.Demo">
+    <compile files="module-info.java pkg/Demo.java otherpkg/Azpect.java" modulepath="$runtimemodule" outjar="demomodule.jar" options="-1.9"/>
+    <run modulepath="$runtimemodule:demomodule.jar" module="demo/pkg.Demo">
       <stdout>
       <line text="Azpect running"/>
       <line text="Demo running"/>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml
index 7d64d493e..2a4be40f8 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml
@@ -2,6 +2,42 @@
 
 <suite>
 
+    <ajc-test dir="bugs193/333274" vm="1.8" title="nested around proceed">
+        <compile files="ma/aspect2/Aspect2.java,ma/aspect2/Annotation2.java,ma/aspect3/Aspect3.java,ma/aspect3/Annotation3.java,ma/Precedence.java,ma/Main.java,ma/aspect1/Aspect1.java,ma/aspect1/Annotation1.java" options="-showWeaveInfo -1.8 -XnoInline">
+	        <message kind="weave" text="Join point 'method-execution(int ma.Main$Dummy.retryTranslateAndTimeLimited())' in Type 'ma.Main$Dummy' (Main.java:16) advised by around advice from 'ma.aspect3.Aspect3' (Aspect3.java:11)"/>
+	        <message kind="weave" text="Join point 'method-execution(int ma.Main$Dummy.retryTranslateAndTimeLimited())' in Type 'ma.Main$Dummy' (Main.java:16) advised by around advice from 'ma.aspect2.Aspect2' (Aspect2.java:11)"/>
+	        <message kind="weave" text="Join point 'method-execution(int ma.Main$Dummy.retryTranslateAndTimeLimited())' in Type 'ma.Main$Dummy' (Main.java:16) advised by around advice from 'ma.aspect1.Aspect1' (Aspect1.java:12)"/>
+        </compile>
+        <!-- 
+        >In Aspect1
+>In Aspect2
+>In Aspect3
+Method call
+<In Aspect3
+<In Aspect2
+=In Aspect1
+Method call
+<In Aspect1
+ -->
+        <run class="ma.Main">
+	        <stdout>
+	        <line text="&gt;In Aspect1"/>
+	        <line text="&gt;In Aspect2"/>
+	        <line text="&gt;In Aspect3"/>
+	        <line text="Method call"/>
+	        <line text="&lt;In Aspect3"/>
+	        <line text="&lt;In Aspect2"/>
+	        <line text="=In Aspect1"/>
+	        <line text="&gt;In Aspect2"/>
+	        <line text="&gt;In Aspect3"/>
+	        <line text="Method call"/>
+	        <line text="&lt;In Aspect3"/>
+	        <line text="&lt;In Aspect2"/>
+			<line text="&lt;In Aspect1"/>
+	        </stdout>
+        </run>
+    </ajc-test>
+
     <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - control">
         <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8">
 	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>