diff options
| author | aclement <aclement> | 2006-05-12 12:32:42 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2006-05-12 12:32:42 +0000 |
| commit | 64d321521a3e66e39510c2c150ba6b06ca40cc68 (patch) | |
| tree | 4f69c6ffeb3269adc86adcbe7cf60c0cda600eca /tests/src | |
| parent | 7a955f0f8f2fcd843e8c796e3f1ac9136fd77d82 (diff) | |
| download | aspectj-64d321521a3e66e39510c2c150ba6b06ca40cc68.tar.gz aspectj-64d321521a3e66e39510c2c150ba6b06ca40cc68.zip | |
tests and fix for 136026: cflow verifyerror in non trivial combination of cflow pointcuts.
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java | 2 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc152/ajc152.xml | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java index bc369eca7..8344f1070 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -17,6 +17,8 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { + public void testVerifyErrorForComplexCflow_pr136026() { runTest("verifyerror");} + public void testVerifyErrorForComplexCflow_pr136026_2() { runTest("verifyerror - 2");} public void testAnnotationsAndGenericsBCException_pr129704() { runTest("annotations and generics leading to BCException");} public void testMethodTooBigAfterWeaving_pr138384() { runTest("method too big"); } public void testNotAtWithincode_pr138158_1() { runTest("not at withincode - 1");} diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml index ce82b82eb..08b008bdf 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml +++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml @@ -24,6 +24,32 @@ </run> </ajc-test> + <ajc-test dir="bugs152/pr136026" title="verifyerror"> + <compile files="CflowOrder.java" options="-1.5"/> + <run class="CflowOrder"/> + </ajc-test> + + <ajc-test dir="bugs152/pr136026" title="verifyerror - 2"> + <compile files="CflowOrderOriginal.java" options="-1.5"/> + <run class="bugs.CflowOrderOriginal"> + <stderr> + <line text="Starting CflowOrder.main(..)"/> + <line text="topAnnotated"/> + <!--line text=" Join point: call(void bugs.CflowOrderOriginal.A.foo())"/> + <line text=" Enclosing join point: execution(void bugs.CflowOrderOriginal.A.main(String[]))"/> + <line text=" Annotation: @bugs.CflowOrderOriginal$Annotation(value=A.foo)"/--> + <line text="nonTopAnnotated"/> + <!--line text=" Join point: call(void bugs.CflowOrderOriginal.B.foo())"/> + <line text=" Enclosing join point: execution(void bugs.CflowOrderOriginal.A.foo())"/> + <line text=" Annotation: @bugs.CflowOrderOriginal$Annotation(value=B.foo)"/--> + <line text="B.foo()"/> + <line text="A.foo()"/> + <line text="A.main(..)"/> + <line text="Ending CflowOrder.main(..)"/> + </stderr> + </run> + </ajc-test> + <ajc-test dir="bugs152/pr136258" title="stack overflow"> <compile files="StatisticsTypeImpl.java" options="-1.5"/> <run class="StatisticsTypeImpl"/> |