Merge branch 'master' into java-18

# Conflicts:
#	tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java
#	tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java
index cb3b781bb..8453bc163 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java
@@ -21,6 +21,23 @@ public class Bugs198Tests extends XMLBasedAjcTestCase {
     runTest("ITD annotation with mandatory parameter via aspectpath");
   }
 
+  public void testAsyncProceedNestedAroundAdvice_gh128() {
+    runTest("asynchronous proceed for nested around-advice (@AspectJ)");
+  }
+
+  public void testAsyncProceedNestedAroundAdviceThreadPool_gh128() {
+    // TODO: future improvement, see https://github.com/eclipse/org.aspectj/issues/141
+    // runTest("asynchronous proceed for nested around-advice (@AspectJ, thread pool)");
+  }
+
+  public void testAsyncProceedNestedAroundAdviceNative_gh128() {
+    runTest("asynchronous proceed for nested around-advice (native)");
+  }
+
+  public void testAsyncProceedNestedAroundAdviceNativeThreadPool_gh128() {
+    runTest("asynchronous proceed for nested around-advice (native, thread pool)");
+  }
+
   public static Test suite() {
     return XMLBasedAjcTestCase.loadSuite(Bugs198Tests.class);
   }