diff options
| -rw-r--r-- | tests/bugs198/github_128/annotation_syntax/MarkerAAspect.aj (renamed from tests/bugs198/github_128/MarkerAAspect.aj) | 0 | ||||
| -rw-r--r-- | tests/bugs198/github_128/annotation_syntax/MarkerBAspect.aj (renamed from tests/bugs198/github_128/MarkerBAspect.aj) | 0 | ||||
| -rw-r--r-- | tests/bugs198/github_128/native_syntax/MarkerAAspect.aj (renamed from tests/bugs198/github_128/MarkerANativeAspect.aj) | 5 | ||||
| -rw-r--r-- | tests/bugs198/github_128/native_syntax/MarkerBAspect.aj (renamed from tests/bugs198/github_128/MarkerBNativeAspect.aj) | 6 | ||||
| -rw-r--r-- | tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml | 8 |
5 files changed, 7 insertions, 12 deletions
diff --git a/tests/bugs198/github_128/MarkerAAspect.aj b/tests/bugs198/github_128/annotation_syntax/MarkerAAspect.aj index d090ed9ea..d090ed9ea 100644 --- a/tests/bugs198/github_128/MarkerAAspect.aj +++ b/tests/bugs198/github_128/annotation_syntax/MarkerAAspect.aj diff --git a/tests/bugs198/github_128/MarkerBAspect.aj b/tests/bugs198/github_128/annotation_syntax/MarkerBAspect.aj index d5548f9da..d5548f9da 100644 --- a/tests/bugs198/github_128/MarkerBAspect.aj +++ b/tests/bugs198/github_128/annotation_syntax/MarkerBAspect.aj diff --git a/tests/bugs198/github_128/MarkerANativeAspect.aj b/tests/bugs198/github_128/native_syntax/MarkerAAspect.aj index 37d9f2fee..5e2ac5424 100644 --- a/tests/bugs198/github_128/MarkerANativeAspect.aj +++ b/tests/bugs198/github_128/native_syntax/MarkerAAspect.aj @@ -1,6 +1,5 @@ -public aspect MarkerANativeAspect { - declare precedence : MarkerANativeAspect, MarkerBNativeAspect; - public static int proceedTimes = 1; +public aspect MarkerAAspect { + declare precedence : MarkerAAspect, MarkerBAspect; Object around() : @annotation(MarkerA) && execution(* *(..)) { System.out.println(">> Outer intercept"); diff --git a/tests/bugs198/github_128/MarkerBNativeAspect.aj b/tests/bugs198/github_128/native_syntax/MarkerBAspect.aj index 6bd4b8683..52e95d1eb 100644 --- a/tests/bugs198/github_128/MarkerBNativeAspect.aj +++ b/tests/bugs198/github_128/native_syntax/MarkerBAspect.aj @@ -1,8 +1,4 @@ -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public aspect MarkerBNativeAspect { +public aspect MarkerBAspect { Object around() : @annotation(MarkerB) && execution(* *(..)) { Runnable runnable = new Runnable() { @Override 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 0e1132782..25f5692f2 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml @@ -168,7 +168,7 @@ </ajc-test> <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (@AspectJ)"> - <compile files="Application.java MarkerA.java MarkerAAspect.aj MarkerB.java MarkerBAspect.aj" options="-1.8" /> + <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"/> @@ -247,7 +247,7 @@ </ajc-test> <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (@AspectJ, thread pool)"> - <compile files="Application.java MarkerA.java MarkerAAspect.aj MarkerB.java MarkerBAspect.aj" options="-1.8" /> + <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"/> @@ -326,7 +326,7 @@ </ajc-test> <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (native)"> - <compile files="Application.java MarkerA.java MarkerANativeAspect.aj MarkerB.java MarkerBNativeAspect.aj" options="-1.8" /> + <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"/> @@ -405,7 +405,7 @@ </ajc-test> <ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (native, thread pool)"> - <compile files="Application.java MarkerA.java MarkerANativeAspect.aj MarkerB.java MarkerBNativeAspect.aj" options="-1.8" /> + <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"/> |