Skip to content

Commit 8ba1445

Browse files
kriegaexkriegaex
committed
Move eclipse-aspectjGH-128 tests from 1.9.8 to 1.9.9 bugs test suite after merge
Signed-off-by: Alexander Kriegisch <[email protected]>
1 parent 948ad9f commit 8ba1445

File tree

11 files changed

+333
-333
lines changed

11 files changed

+333
-333
lines changed

‎tests/bugs198/github_128/Application.java renamed to ‎tests/bugs199/github_128/Application.java

File renamed without changes.

‎tests/bugs198/github_128/MarkerA.java renamed to ‎tests/bugs199/github_128/MarkerA.java

File renamed without changes.

‎tests/bugs198/github_128/MarkerB.java renamed to ‎tests/bugs199/github_128/MarkerB.java

File renamed without changes.

‎tests/bugs198/github_128/annotation_syntax/MarkerAAspect.aj renamed to ‎tests/bugs199/github_128/annotation_syntax/MarkerAAspect.aj

File renamed without changes.

‎tests/bugs198/github_128/annotation_syntax/MarkerBAspect.aj renamed to ‎tests/bugs199/github_128/annotation_syntax/MarkerBAspect.aj

File renamed without changes.

‎tests/bugs198/github_128/native_syntax/MarkerAAspect.aj renamed to ‎tests/bugs199/github_128/native_syntax/MarkerAAspect.aj

File renamed without changes.

‎tests/bugs198/github_128/native_syntax/MarkerBAspect.aj renamed to ‎tests/bugs199/github_128/native_syntax/MarkerBAspect.aj

File renamed without changes.

‎tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,6 @@ public void testGitHub_105() {
2121
runTest("ITD annotation with mandatory parameter via aspectpath");
2222
}
2323

24-
public void testAsyncProceedNestedAroundAdvice_gh128() {
25-
runTest("asynchronous proceed for nested around-advice (@AspectJ)");
26-
}
27-
28-
public void testAsyncProceedNestedAroundAdviceThreadPool_gh128() {
29-
// TODO: future improvement, see https://github.com/eclipse/org.aspectj/issues/141
30-
// runTest("asynchronous proceed for nested around-advice (@AspectJ, thread pool)");
31-
}
32-
33-
public void testAsyncProceedNestedAroundAdviceNative_gh128() {
34-
runTest("asynchronous proceed for nested around-advice (native)");
35-
}
36-
37-
public void testAsyncProceedNestedAroundAdviceNativeThreadPool_gh128() {
38-
runTest("asynchronous proceed for nested around-advice (native, thread pool)");
39-
}
40-
4124
public static Test suite() {
4225
return XMLBasedAjcTestCase.loadSuite(Bugs198Tests.class);
4326
}

‎tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,23 @@ public void testGitHub_125() {
4444
}
4545
}
4646

47+
public void testAsyncProceedNestedAroundAdvice_gh128() {
48+
runTest("asynchronous proceed for nested around-advice (@AspectJ)");
49+
}
50+
51+
public void testAsyncProceedNestedAroundAdviceThreadPool_gh128() {
52+
// TODO: future improvement, see https://github.com/eclipse/org.aspectj/issues/141
53+
// runTest("asynchronous proceed for nested around-advice (@AspectJ, thread pool)");
54+
}
55+
56+
public void testAsyncProceedNestedAroundAdviceNative_gh128() {
57+
runTest("asynchronous proceed for nested around-advice (native)");
58+
}
59+
60+
public void testAsyncProceedNestedAroundAdviceNativeThreadPool_gh128() {
61+
runTest("asynchronous proceed for nested around-advice (native, thread pool)");
62+
}
63+
4764
public static Test suite() {
4865
return XMLBasedAjcTestCase.loadSuite(Bugs199Tests.class);
4966
}

‎tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml

Lines changed: 0 additions & 316 deletions
Original file line numberDiff line numberDiff line change
@@ -100,320 +100,4 @@
100100
<compile files="Buffers.java" options="--release 8"/>
101101
</ajc-test>
102102

103-
<ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (@AspectJ)">
104-
<compile files="Application.java MarkerA.java MarkerB.java annotation_syntax/MarkerAAspect.aj annotation_syntax/MarkerBAspect.aj" options="-1.8" />
105-
<run class="Application" options="1,1">
106-
<stdout ordered="no">
107-
<line text=">> Outer intercept"/>
108-
<line text=" >> Outer proceed"/>
109-
<line text=" >> Inner intercept"/>
110-
<line text=" &lt;&lt; Inner intercept"/>
111-
<line text=" &lt;&lt; Outer proceed"/>
112-
<line text="&lt;&lt; Outer intercept"/>
113-
<line text=" >> Inner proceed"/>
114-
<line text=" Doing something"/>
115-
<line text=" &lt;&lt; Inner proceed"/>
116-
</stdout>
117-
</run>
118-
<run class="Application" options="2,1">
119-
<stdout ordered="no">
120-
<line text=">> Outer intercept"/>
121-
<line text=" >> Outer proceed"/>
122-
<line text=" >> Inner intercept"/>
123-
<line text=" &lt;&lt; Inner intercept"/>
124-
<line text=" &lt;&lt; Outer proceed"/>
125-
<line text=" >> Outer proceed"/>
126-
<line text=" >> Inner intercept"/>
127-
<line text=" >> Inner proceed"/>
128-
<line text=" Doing something"/>
129-
<line text=" &lt;&lt; Inner proceed"/>
130-
<line text=" &lt;&lt; Inner intercept"/>
131-
<line text=" &lt;&lt; Outer proceed"/>
132-
<line text=" >> Inner proceed"/>
133-
<line text=" Doing something"/>
134-
<line text=" &lt;&lt; Inner proceed"/>
135-
<line text="&lt;&lt; Outer intercept"/>
136-
</stdout>
137-
</run>
138-
<run class="Application" options="1,2">
139-
<stdout ordered="no">
140-
<line text=">> Outer intercept"/>
141-
<line text=" >> Outer proceed"/>
142-
<line text=" >> Inner intercept"/>
143-
<line text=" &lt;&lt; Inner intercept"/>
144-
<line text=" &lt;&lt; Outer proceed"/>
145-
<line text="&lt;&lt; Outer intercept"/>
146-
<line text=" >> Inner proceed"/>
147-
<line text=" Doing something"/>
148-
<line text=" &lt;&lt; Inner proceed"/>
149-
<line text=" >> Inner proceed"/>
150-
<line text=" Doing something"/>
151-
<line text=" &lt;&lt; Inner proceed"/>
152-
</stdout>
153-
</run>
154-
<run class="Application" options="2,2">
155-
<stdout ordered="no">
156-
<line text=">> Outer intercept"/>
157-
<line text=" >> Outer proceed"/>
158-
<line text=" >> Inner intercept"/>
159-
<line text=" &lt;&lt; Inner intercept"/>
160-
<line text=" &lt;&lt; Outer proceed"/>
161-
<line text=" >> Outer proceed"/>
162-
<line text=" >> Inner intercept"/>
163-
<line text=" >> Inner proceed"/>
164-
<line text=" &lt;&lt; Inner intercept"/>
165-
<line text=" Doing something"/>
166-
<line text=" &lt;&lt; Inner proceed"/>
167-
<line text=" &lt;&lt; Outer proceed"/>
168-
<line text=" >> Inner proceed"/>
169-
<line text=" >> Inner proceed"/>
170-
<line text=" Doing something"/>
171-
<line text=" &lt;&lt; Inner proceed"/>
172-
<line text=" >> Inner proceed"/>
173-
<line text=" Doing something"/>
174-
<line text=" &lt;&lt; Inner proceed"/>
175-
<line text=" Doing something"/>
176-
<line text=" &lt;&lt; Inner proceed"/>
177-
<line text="&lt;&lt; Outer intercept"/>
178-
</stdout>
179-
</run>
180-
</ajc-test>
181-
182-
<ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (@AspectJ, thread pool)">
183-
<compile files="Application.java MarkerA.java MarkerB.java annotation_syntax/MarkerAAspect.aj annotation_syntax/MarkerBAspect.aj" options="-1.8" />
184-
<run class="Application" options="1,1,true">
185-
<stdout ordered="no">
186-
<line text=">> Outer intercept"/>
187-
<line text=" >> Outer proceed"/>
188-
<line text=" >> Inner intercept"/>
189-
<line text=" &lt;&lt; Inner intercept"/>
190-
<line text=" &lt;&lt; Outer proceed"/>
191-
<line text="&lt;&lt; Outer intercept"/>
192-
<line text=" >> Inner proceed"/>
193-
<line text=" Doing something"/>
194-
<line text=" &lt;&lt; Inner proceed"/>
195-
</stdout>
196-
</run>
197-
<run class="Application" options="2,1,true">
198-
<stdout ordered="no">
199-
<line text=">> Outer intercept"/>
200-
<line text=" >> Outer proceed"/>
201-
<line text=" >> Inner intercept"/>
202-
<line text=" &lt;&lt; Inner intercept"/>
203-
<line text=" &lt;&lt; Outer proceed"/>
204-
<line text=" >> Outer proceed"/>
205-
<line text=" >> Inner intercept"/>
206-
<line text=" >> Inner proceed"/>
207-
<line text=" Doing something"/>
208-
<line text=" &lt;&lt; Inner proceed"/>
209-
<line text=" &lt;&lt; Inner intercept"/>
210-
<line text=" &lt;&lt; Outer proceed"/>
211-
<line text=" >> Inner proceed"/>
212-
<line text=" Doing something"/>
213-
<line text=" &lt;&lt; Inner proceed"/>
214-
<line text="&lt;&lt; Outer intercept"/>
215-
</stdout>
216-
</run>
217-
<run class="Application" options="1,2,true">
218-
<stdout ordered="no">
219-
<line text=">> Outer intercept"/>
220-
<line text=" >> Outer proceed"/>
221-
<line text=" >> Inner intercept"/>
222-
<line text=" &lt;&lt; Inner intercept"/>
223-
<line text=" &lt;&lt; Outer proceed"/>
224-
<line text="&lt;&lt; Outer intercept"/>
225-
<line text=" >> Inner proceed"/>
226-
<line text=" Doing something"/>
227-
<line text=" &lt;&lt; Inner proceed"/>
228-
<line text=" >> Inner proceed"/>
229-
<line text=" Doing something"/>
230-
<line text=" &lt;&lt; Inner proceed"/>
231-
</stdout>
232-
</run>
233-
<run class="Application" options="2,2,true">
234-
<stdout ordered="no">
235-
<line text=">> Outer intercept"/>
236-
<line text=" >> Outer proceed"/>
237-
<line text=" >> Inner intercept"/>
238-
<line text=" &lt;&lt; Inner intercept"/>
239-
<line text=" &lt;&lt; Outer proceed"/>
240-
<line text=" >> Outer proceed"/>
241-
<line text=" >> Inner intercept"/>
242-
<line text=" >> Inner proceed"/>
243-
<line text=" &lt;&lt; Inner intercept"/>
244-
<line text=" Doing something"/>
245-
<line text=" &lt;&lt; Inner proceed"/>
246-
<line text=" &lt;&lt; Outer proceed"/>
247-
<line text=" >> Inner proceed"/>
248-
<line text=" >> Inner proceed"/>
249-
<line text=" Doing something"/>
250-
<line text=" &lt;&lt; Inner proceed"/>
251-
<line text=" >> Inner proceed"/>
252-
<line text=" Doing something"/>
253-
<line text=" &lt;&lt; Inner proceed"/>
254-
<line text=" Doing something"/>
255-
<line text=" &lt;&lt; Inner proceed"/>
256-
<line text="&lt;&lt; Outer intercept"/>
257-
</stdout>
258-
</run>
259-
</ajc-test>
260-
261-
<ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (native)">
262-
<compile files="Application.java MarkerA.java MarkerB.java native_syntax/MarkerAAspect.aj native_syntax/MarkerBAspect.aj" options="-1.8" />
263-
<run class="Application" options="1,1">
264-
<stdout ordered="no">
265-
<line text=">> Outer intercept"/>
266-
<line text=" >> Outer proceed"/>
267-
<line text=" >> Inner intercept"/>
268-
<line text=" &lt;&lt; Inner intercept"/>
269-
<line text=" &lt;&lt; Outer proceed"/>
270-
<line text="&lt;&lt; Outer intercept"/>
271-
<line text=" >> Inner proceed"/>
272-
<line text=" Doing something"/>
273-
<line text=" &lt;&lt; Inner proceed"/>
274-
</stdout>
275-
</run>
276-
<run class="Application" options="2,1">
277-
<stdout ordered="no">
278-
<line text=">> Outer intercept"/>
279-
<line text=" >> Outer proceed"/>
280-
<line text=" >> Inner intercept"/>
281-
<line text=" &lt;&lt; Inner intercept"/>
282-
<line text=" &lt;&lt; Outer proceed"/>
283-
<line text=" >> Outer proceed"/>
284-
<line text=" >> Inner intercept"/>
285-
<line text=" >> Inner proceed"/>
286-
<line text=" Doing something"/>
287-
<line text=" &lt;&lt; Inner proceed"/>
288-
<line text=" &lt;&lt; Inner intercept"/>
289-
<line text=" &lt;&lt; Outer proceed"/>
290-
<line text=" >> Inner proceed"/>
291-
<line text=" Doing something"/>
292-
<line text=" &lt;&lt; Inner proceed"/>
293-
<line text="&lt;&lt; Outer intercept"/>
294-
</stdout>
295-
</run>
296-
<run class="Application" options="1,2">
297-
<stdout ordered="no">
298-
<line text=">> Outer intercept"/>
299-
<line text=" >> Outer proceed"/>
300-
<line text=" >> Inner intercept"/>
301-
<line text=" &lt;&lt; Inner intercept"/>
302-
<line text=" &lt;&lt; Outer proceed"/>
303-
<line text="&lt;&lt; Outer intercept"/>
304-
<line text=" >> Inner proceed"/>
305-
<line text=" Doing something"/>
306-
<line text=" &lt;&lt; Inner proceed"/>
307-
<line text=" >> Inner proceed"/>
308-
<line text=" Doing something"/>
309-
<line text=" &lt;&lt; Inner proceed"/>
310-
</stdout>
311-
</run>
312-
<run class="Application" options="2,2">
313-
<stdout ordered="no">
314-
<line text=">> Outer intercept"/>
315-
<line text=" >> Outer proceed"/>
316-
<line text=" >> Inner intercept"/>
317-
<line text=" &lt;&lt; Inner intercept"/>
318-
<line text=" &lt;&lt; Outer proceed"/>
319-
<line text=" >> Outer proceed"/>
320-
<line text=" >> Inner intercept"/>
321-
<line text=" >> Inner proceed"/>
322-
<line text=" &lt;&lt; Inner intercept"/>
323-
<line text=" Doing something"/>
324-
<line text=" &lt;&lt; Inner proceed"/>
325-
<line text=" &lt;&lt; Outer proceed"/>
326-
<line text=" >> Inner proceed"/>
327-
<line text=" >> Inner proceed"/>
328-
<line text=" Doing something"/>
329-
<line text=" &lt;&lt; Inner proceed"/>
330-
<line text=" >> Inner proceed"/>
331-
<line text=" Doing something"/>
332-
<line text=" &lt;&lt; Inner proceed"/>
333-
<line text=" Doing something"/>
334-
<line text=" &lt;&lt; Inner proceed"/>
335-
<line text="&lt;&lt; Outer intercept"/>
336-
</stdout>
337-
</run>
338-
</ajc-test>
339-
340-
<ajc-test dir="bugs198/github_128" title="asynchronous proceed for nested around-advice (native, thread pool)">
341-
<compile files="Application.java MarkerA.java MarkerB.java native_syntax/MarkerAAspect.aj native_syntax/MarkerBAspect.aj" options="-1.8" />
342-
<run class="Application" options="1,1,true">
343-
<stdout ordered="no">
344-
<line text=">> Outer intercept"/>
345-
<line text=" >> Outer proceed"/>
346-
<line text=" >> Inner intercept"/>
347-
<line text=" &lt;&lt; Inner intercept"/>
348-
<line text=" &lt;&lt; Outer proceed"/>
349-
<line text="&lt;&lt; Outer intercept"/>
350-
<line text=" >> Inner proceed"/>
351-
<line text=" Doing something"/>
352-
<line text=" &lt;&lt; Inner proceed"/>
353-
</stdout>
354-
</run>
355-
<run class="Application" options="2,1,true">
356-
<stdout ordered="no">
357-
<line text=">> Outer intercept"/>
358-
<line text=" >> Outer proceed"/>
359-
<line text=" >> Inner intercept"/>
360-
<line text=" &lt;&lt; Inner intercept"/>
361-
<line text=" &lt;&lt; Outer proceed"/>
362-
<line text=" >> Outer proceed"/>
363-
<line text=" >> Inner intercept"/>
364-
<line text=" >> Inner proceed"/>
365-
<line text=" Doing something"/>
366-
<line text=" &lt;&lt; Inner proceed"/>
367-
<line text=" &lt;&lt; Inner intercept"/>
368-
<line text=" &lt;&lt; Outer proceed"/>
369-
<line text=" >> Inner proceed"/>
370-
<line text=" Doing something"/>
371-
<line text=" &lt;&lt; Inner proceed"/>
372-
<line text="&lt;&lt; Outer intercept"/>
373-
</stdout>
374-
</run>
375-
<run class="Application" options="1,2,true">
376-
<stdout ordered="no">
377-
<line text=">> Outer intercept"/>
378-
<line text=" >> Outer proceed"/>
379-
<line text=" >> Inner intercept"/>
380-
<line text=" &lt;&lt; Inner intercept"/>
381-
<line text=" &lt;&lt; Outer proceed"/>
382-
<line text="&lt;&lt; Outer intercept"/>
383-
<line text=" >> Inner proceed"/>
384-
<line text=" Doing something"/>
385-
<line text=" &lt;&lt; Inner proceed"/>
386-
<line text=" >> Inner proceed"/>
387-
<line text=" Doing something"/>
388-
<line text=" &lt;&lt; Inner proceed"/>
389-
</stdout>
390-
</run>
391-
<run class="Application" options="2,2,true">
392-
<stdout ordered="no">
393-
<line text=">> Outer intercept"/>
394-
<line text=" >> Outer proceed"/>
395-
<line text=" >> Inner intercept"/>
396-
<line text=" &lt;&lt; Inner intercept"/>
397-
<line text=" &lt;&lt; Outer proceed"/>
398-
<line text=" >> Outer proceed"/>
399-
<line text=" >> Inner intercept"/>
400-
<line text=" >> Inner proceed"/>
401-
<line text=" &lt;&lt; Inner intercept"/>
402-
<line text=" Doing something"/>
403-
<line text=" &lt;&lt; Inner proceed"/>
404-
<line text=" &lt;&lt; Outer proceed"/>
405-
<line text=" >> Inner proceed"/>
406-
<line text=" >> Inner proceed"/>
407-
<line text=" Doing something"/>
408-
<line text=" &lt;&lt; Inner proceed"/>
409-
<line text=" >> Inner proceed"/>
410-
<line text=" Doing something"/>
411-
<line text=" &lt;&lt; Inner proceed"/>
412-
<line text=" Doing something"/>
413-
<line text=" &lt;&lt; Inner proceed"/>
414-
<line text="&lt;&lt; Outer intercept"/>
415-
</stdout>
416-
</run>
417-
</ajc-test>
418-
419103
</suite>

0 commit comments

Comments
 (0)