diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-03-23 15:51:42 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-03-23 15:51:42 +0700 |
| commit | 8ba1445b28ad396c34633aebd334e5259f815a55 (patch) | |
| tree | 272600aefb33376cf3af11a35406bc43e074f2c8 | |
| parent | 948ad9f39537d9cc9d38e8b5fc6fcb9bd685ed0f (diff) | |
| download | aspectj-8ba1445b28ad396c34633aebd334e5259f815a55.tar.gz aspectj-8ba1445b28ad396c34633aebd334e5259f815a55.zip | |
Move GH-128 tests from 1.9.8 to 1.9.9 bugs test suite after merge
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
11 files changed, 333 insertions, 333 deletions
diff --git a/tests/bugs198/github_128/Application.java b/tests/bugs199/github_128/Application.java index 9a4a7312f..9a4a7312f 100644 --- a/tests/bugs198/github_128/Application.java +++ b/tests/bugs199/github_128/Application.java diff --git a/tests/bugs198/github_128/MarkerA.java b/tests/bugs199/github_128/MarkerA.java index 89e60978c..89e60978c 100644 --- a/tests/bugs198/github_128/MarkerA.java +++ b/tests/bugs199/github_128/MarkerA.java diff --git a/tests/bugs198/github_128/MarkerB.java b/tests/bugs199/github_128/MarkerB.java index 6f6aa3dd0..6f6aa3dd0 100644 --- a/tests/bugs198/github_128/MarkerB.java +++ b/tests/bugs199/github_128/MarkerB.java diff --git a/tests/bugs198/github_128/annotation_syntax/MarkerAAspect.aj b/tests/bugs199/github_128/annotation_syntax/MarkerAAspect.aj index d090ed9ea..d090ed9ea 100644 --- a/tests/bugs198/github_128/annotation_syntax/MarkerAAspect.aj +++ b/tests/bugs199/github_128/annotation_syntax/MarkerAAspect.aj diff --git a/tests/bugs198/github_128/annotation_syntax/MarkerBAspect.aj b/tests/bugs199/github_128/annotation_syntax/MarkerBAspect.aj index d5548f9da..d5548f9da 100644 --- a/tests/bugs198/github_128/annotation_syntax/MarkerBAspect.aj +++ b/tests/bugs199/github_128/annotation_syntax/MarkerBAspect.aj diff --git a/tests/bugs198/github_128/native_syntax/MarkerAAspect.aj b/tests/bugs199/github_128/native_syntax/MarkerAAspect.aj index 5e2ac5424..5e2ac5424 100644 --- a/tests/bugs198/github_128/native_syntax/MarkerAAspect.aj +++ b/tests/bugs199/github_128/native_syntax/MarkerAAspect.aj diff --git a/tests/bugs198/github_128/native_syntax/MarkerBAspect.aj b/tests/bugs199/github_128/native_syntax/MarkerBAspect.aj index 52e95d1eb..52e95d1eb 100644 --- a/tests/bugs198/github_128/native_syntax/MarkerBAspect.aj +++ b/tests/bugs199/github_128/native_syntax/MarkerBAspect.aj 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 8453bc163..cb3b781bb 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java @@ -21,23 +21,6 @@ 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); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java index f72f3c44c..d8939593b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java @@ -44,6 +44,23 @@ public class Bugs199Tests extends XMLBasedAjcTestCase { } } + 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(Bugs199Tests.class); } diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml index 6f2a34274..85bd872b3 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml @@ -100,320 +100,4 @@ <compile files="Buffers.java" options="--release 8"/> </ajc-test> - <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (@AspectJ)"> - <compile files="Application.java MarkerA.java MarkerB.java annotation_syntax/MarkerAAspect.aj annotation_syntax/MarkerBAspect.aj" options="-1.8" /> - <run class="Application" options="1,1"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,1"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - <run class="Application" options="1,2"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,2"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - </ajc-test> - - <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (@AspectJ, thread pool)"> - <compile files="Application.java MarkerA.java MarkerB.java annotation_syntax/MarkerAAspect.aj annotation_syntax/MarkerBAspect.aj" options="-1.8" /> - <run class="Application" options="1,1,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,1,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - <run class="Application" options="1,2,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,2,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - </ajc-test> - - <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (native)"> - <compile files="Application.java MarkerA.java MarkerB.java native_syntax/MarkerAAspect.aj native_syntax/MarkerBAspect.aj" options="-1.8" /> - <run class="Application" options="1,1"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,1"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - <run class="Application" options="1,2"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,2"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - </ajc-test> - - <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (native, thread pool)"> - <compile files="Application.java MarkerA.java MarkerB.java native_syntax/MarkerAAspect.aj native_syntax/MarkerBAspect.aj" options="-1.8" /> - <run class="Application" options="1,1,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,1,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - <run class="Application" options="1,2,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text="<< Outer intercept"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - </stdout> - </run> - <run class="Application" options="2,2,true"> - <stdout ordered="no"> - <line text=">> Outer intercept"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" << Inner intercept"/> - <line text=" << Outer proceed"/> - <line text=" >> Outer proceed"/> - <line text=" >> Inner intercept"/> - <line text=" >> Inner proceed"/> - <line text=" << Inner intercept"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" << Outer proceed"/> - <line text=" >> Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" >> Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text=" Doing something"/> - <line text=" << Inner proceed"/> - <line text="<< Outer intercept"/> - </stdout> - </run> - </ajc-test> - </suite> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml index f76858a3b..f0510e79a 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml @@ -174,4 +174,320 @@ </run> </ajc-test> + <ajc-test dir="bugs199/github_128" title="asynchronous proceed for nested around-advice (@AspectJ)"> + <compile files="Application.java MarkerA.java MarkerB.java annotation_syntax/MarkerAAspect.aj annotation_syntax/MarkerBAspect.aj" options="-1.8" /> + <run class="Application" options="1,1"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,1"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + <run class="Application" options="1,2"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,2"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="bugs199/github_128" title="asynchronous proceed for nested around-advice (@AspectJ, thread pool)"> + <compile files="Application.java MarkerA.java MarkerB.java annotation_syntax/MarkerAAspect.aj annotation_syntax/MarkerBAspect.aj" options="-1.8" /> + <run class="Application" options="1,1,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,1,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + <run class="Application" options="1,2,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,2,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="bugs199/github_128" title="asynchronous proceed for nested around-advice (native)"> + <compile files="Application.java MarkerA.java MarkerB.java native_syntax/MarkerAAspect.aj native_syntax/MarkerBAspect.aj" options="-1.8" /> + <run class="Application" options="1,1"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,1"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + <run class="Application" options="1,2"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,2"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="bugs199/github_128" title="asynchronous proceed for nested around-advice (native, thread pool)"> + <compile files="Application.java MarkerA.java MarkerB.java native_syntax/MarkerAAspect.aj native_syntax/MarkerBAspect.aj" options="-1.8" /> + <run class="Application" options="1,1,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,1,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + <run class="Application" options="1,2,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text="<< Outer intercept"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + </stdout> + </run> + <run class="Application" options="2,2,true"> + <stdout ordered="no"> + <line text=">> Outer intercept"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" << Inner intercept"/> + <line text=" << Outer proceed"/> + <line text=" >> Outer proceed"/> + <line text=" >> Inner intercept"/> + <line text=" >> Inner proceed"/> + <line text=" << Inner intercept"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" << Outer proceed"/> + <line text=" >> Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" >> Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text=" Doing something"/> + <line text=" << Inner proceed"/> + <line text="<< Outer intercept"/> + </stdout> + </run> + </ajc-test> + </suite> |