Skip to content

Commit

Permalink
Move eclipse-aspectjGH-128 tests from 1.9.8 to 1.9.9 bugs test suite …
Browse files Browse the repository at this point in the history 
…after merge

Signed-off-by: Alexander Kriegisch <[email protected]>
  • Loading branch information
@kriegaex
kriegaex committed Mar 23, 2022
1 parent 948ad9f commit 8ba1445
Show file tree
Hide file tree
Showing 11 changed files with 333 additions and 333 deletions.
0 tests/bugs198/github_128/Application.java → tests/bugs199/github_128/Application.java
View file
File renamed without changes.
0 tests/bugs198/github_128/MarkerA.java → tests/bugs199/github_128/MarkerA.java
View file
File renamed without changes.
0 tests/bugs198/github_128/MarkerB.java → tests/bugs199/github_128/MarkerB.java
View file
File renamed without changes.
0 ...ub_128/annotation_syntax/MarkerAAspect.aj → ...ub_128/annotation_syntax/MarkerAAspect.aj
View file
File renamed without changes.
0 ...ub_128/annotation_syntax/MarkerBAspect.aj → ...ub_128/annotation_syntax/MarkerBAspect.aj
View file
File renamed without changes.
0 ...github_128/native_syntax/MarkerAAspect.aj → ...github_128/native_syntax/MarkerAAspect.aj
View file
File renamed without changes.
0 ...github_128/native_syntax/MarkerBAspect.aj → ...github_128/native_syntax/MarkerBAspect.aj
View file
File renamed without changes.
17 changes: 0 additions & 17 deletions tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,6 @@ public void testGitHub_105() {
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);
}
Expand Down
17 changes: 17 additions & 0 deletions tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,23 @@ public void testGitHub_125() {
}
}

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);
}
Expand Down
316 changes: 0 additions & 316 deletions tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text="&lt;&lt; Outer intercept"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; 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=" &lt;&lt; Inner intercept"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Outer proceed"/>
<line text=" >> Inner intercept"/>
<line text=" >> Inner proceed"/>
<line text=" &lt;&lt; Inner intercept"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" &lt;&lt; Outer proceed"/>
<line text=" >> Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" >> Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text=" Doing something"/>
<line text=" &lt;&lt; Inner proceed"/>
<line text="&lt;&lt; Outer intercept"/>
</stdout>
</run>
</ajc-test>

</suite>
Loading

0 comments on commit 8ba1445

Please sign in to comment.