diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/java5/decps/Basic1b.java | 2 | ||||
| -rw-r--r-- | tests/java5/decps/Basic2b.java | 4 | ||||
| -rw-r--r-- | tests/java5/decps/Basic3b.java | 9 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java | 12 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 17 |
5 files changed, 21 insertions, 23 deletions
diff --git a/tests/java5/decps/Basic1b.java b/tests/java5/decps/Basic1b.java index bdbadd9b7..46e4e9bfb 100644 --- a/tests/java5/decps/Basic1b.java +++ b/tests/java5/decps/Basic1b.java @@ -15,7 +15,7 @@ class X { interface I { } - @DeclareParents("Basic1bb") + @DeclareParents("Basic1b") private I someField; } diff --git a/tests/java5/decps/Basic2b.java b/tests/java5/decps/Basic2b.java index babd57f52..59092e5c6 100644 --- a/tests/java5/decps/Basic2b.java +++ b/tests/java5/decps/Basic2b.java @@ -14,12 +14,12 @@ public class Basic2b { interface I { } - class IIimpl implements I { + class IImpl implements I { public void m2() { } } - @DeclareParents("Basic2b",defaultimpl="IImpl") + @DeclareParents(value="Basic2b",defaultImpl=X.IImpl.class) private I simplefield;; diff --git a/tests/java5/decps/Basic3b.java b/tests/java5/decps/Basic3b.java index ab8768ac9..e2bb111d1 100644 --- a/tests/java5/decps/Basic3b.java +++ b/tests/java5/decps/Basic3b.java @@ -16,17 +16,20 @@ public class Basic3b { @Aspect class X { interface I { + public void m2(); + public void m3(); + public void m4(); } - class IIimpl implements I { + class IImpl implements I { public void m2() { } public void m3() { } public void m4() { } } - @DeclareParents("Basic3b",defaultimpl="IImpl") - private I simplefield;; + @DeclareParents(value="Basic3b",defaultImpl=IImpl.class) + private I simplefield; @Before("call(* *(..))") diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java index 4d575a58e..3a972a7c5 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -41,12 +41,12 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { protected File getSpecFile() { return new File("../tests/src/org/aspectj/systemtest/ajc150/ajc150.xml"); } - //public void testDecps1() { runTest("decps - 1");} - //public void testDecps1b() { runTest("decps - 1b");} - //public void testDecps2() { runTest("decps - 2");} - //public void testDecps2b() { runTest("decps - 2b");} - //public void testDecps3() { runTest("decps - 3");} - //public void testDecps3b() { runTest("decps - 3b");} + public void testDecps1() { runTest("decps - 1");} + public void testDecps1b() { runTest("decps - 1b");} + public void testDecps2() { runTest("decps - 2");} + public void testDecps2b() { runTest("decps - 2b");} + public void testDecps3() { runTest("decps - 3");} + // public void testDecps3b() { runTest("decps - 3b");} public void testVarargsNPE_pr120826() { runTest("varargs NPE");} public void testNamedPointcutPertarget_pr120521() { runTest("named pointcut not resolved in pertarget pointcut");} diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index f33b01ff6..9eb5da00f 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -122,11 +122,9 @@ <ajc-test dir="java5/decps" title="decps - 2b"> <compile files="Basic2b.java" options="-1.5 -showWeaveInfo"> - <message kind="weave" text="Join point 'method-execution(void X$I.m2())' in Type 'X' (Basic2.java:15) advised by before advice from 'X' (Basic2b.java:23)"/> - <message kind="weave" text="Type 'X$I' (Basic2b.java) has intertyped method from 'X' (Basic2.java:'void X$I.m2()')"/> + <message kind="weave" text="Join point 'method-execution(void X$IImpl.m2())' in Type 'X$IImpl' (Basic2b.java:18) advised by before advice from 'X' (Basic2b.java:27)"/> <message kind="weave" text="Extending interface set for type 'Basic2b' (Basic2b.java) to include 'X$I' (Basic2b.java)"/> - <message kind="weave" text="Type 'Basic2b' (Basic2b.java) has intertyped method from 'X' (Basic2b.java:'void X$I.m2()')"/> - <message kind="weave" text="Join point 'method-execution(void Basic2.main(java.lang.String[]))' in Type 'Basic2b' (Basic2b.java:2) advised by before advice from 'X' (Basic2b.java:23)"/> + <message kind="weave" text="Join point 'method-execution(void Basic2b.main(java.lang.String[]))' in Type 'Basic2b' (Basic2b.java:4) advised by before advice from 'X' (Basic2b.java:27)"/> </compile> <run class="Basic2b"/> </ajc-test> @@ -154,13 +152,10 @@ <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m2()')"/> <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m3()')"/> <message kind="weave" text="Type 'Basic3b' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m4()')"/> - <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'X' (Basic3b.java:29)"/> - <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'X' (Basic3b.java:29)"/> - <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'X' (Basic3b.java:29)"/> - <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'X' (Basic3b.java:29)"/> - <message kind="weave" text="Type 'X$I' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m2()')"/> - <message kind="weave" text="Type 'X$I' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m3()')"/> - <message kind="weave" text="Type 'X$I' (Basic3b.java) has intertyped method from 'X' (Basic3b.java:'void X$I.m4()')"/> + <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:7) advised by before advice from 'X' (Basic3b.java:36)"/> + <message kind="weave" text="Join point 'method-call(void X$I.m3())' in Type 'Basic3b' (Basic3b.java:8) advised by before advice from 'X' (Basic3b.java:36)"/> + <message kind="weave" text="Join point 'method-call(void X$I.m2())' in Type 'Basic3b' (Basic3b.java:9) advised by before advice from 'X' (Basic3b.java:36)"/> + <message kind="weave" text="Join point 'method-call(void X$I.m4())' in Type 'Basic3b' (Basic3b.java:10) advised by before advice from 'X' (Basic3b.java:36)"/> </compile> <run class="Basic3b"/> </ajc-test> |