diff options
| author | aclement <aclement> | 2006-04-24 10:18:27 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2006-04-24 10:18:27 +0000 |
| commit | 77d9906679b671488272fe62c8409bcc32bbb99c (patch) | |
| tree | b099b1333d2726e688bf5d04ec17687669f46ef8 /tests/src/org | |
| parent | 0fcaf00109da3273daca689ca93e30c3c6809c1c (diff) | |
| download | aspectj-77d9906679b671488272fe62c8409bcc32bbb99c.tar.gz aspectj-77d9906679b671488272fe62c8409bcc32bbb99c.zip | |
fix for 138158
Diffstat (limited to 'tests/src/org')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java | 5 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc152/ajc152.xml | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java index 09d83eb2b..120cd10d2 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -17,8 +17,9 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - //public void testNotAtWithincode_pr138158() { runTest("not at withincode");} - //public void testComplexGenericDecl_pr137568() { runTest("complicated generics declaration");} + public void testNotAtWithincode_pr138158_1() { runTest("not at withincode - 1");} + public void testNotAtWithincode_pr138158_2() { runTest("not at withincode - 2");} +// public void testComplexGenericDecl_pr137568() { runTest("complicated generics declaration");} public void testNpeOnDup_pr138143() { runTest("npe on duplicate method with ataj");} public void testPointcutsAndGenerics_pr137496_1() { runTest("pointcuts and generics - B");} public void testPointcutsAndGenerics_pr137496_2() { runTest("pointcuts and generics - D");} diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml index 024fe802d..4147db02e 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml +++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml @@ -20,13 +20,21 @@ <run class="StatisticsTypeImpl"/> </ajc-test> - <ajc-test dir="bugs152/pr138158" title="not at withincode"> + <ajc-test dir="bugs152/pr138158" title="not at withincode - 1"> <compile files="Boo.java" options="-1.5 -showWeaveInfo"> <message kind="weave" text="Join point 'method-call(void Boo.m())' in Type 'Boo' (Boo.java:9) advised by before advice from 'X' (Boo.java:19)"/> </compile> <run class="Boo"/> </ajc-test> + <ajc-test dir="bugs152/pr138158" title="not at withincode - 2"> + <compile files="Foo.java" options="-1.5 -showWeaveInfo"> + <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Foo' (Foo.java:14) advised by before advice from 'X' (Foo.java:26)"/> + <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Foo' (Foo.java:18) advised by before advice from 'X' (Foo.java:23)"/> + </compile> + <run class="Foo"/> + </ajc-test> + <ajc-test dir="bugs152/pr137568" title="complicated generics declaration"> <compile files="C.java" options="-emacssym -1.5"/> <run class="C"/> |