diff options
| author | acolyer <acolyer> | 2005-11-23 12:52:27 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-11-23 12:52:27 +0000 |
| commit | 8b294d9e4f02625c4c3391612242969fb4b6be57 (patch) | |
| tree | 15b4adfb80b1d162c1a48191b694acfda70eae19 /tests/new | |
| parent | 504e4300204475cef1254de5d1308863c43b26e7 (diff) | |
| download | aspectj-8b294d9e4f02625c4c3391612242969fb4b6be57.tar.gz aspectj-8b294d9e4f02625c4c3391612242969fb4b6be57.zip | |
tests and fix for pr103157
Diffstat (limited to 'tests/new')
| -rw-r--r-- | tests/new/AfterReturningParam.java | 4 | ||||
| -rw-r--r-- | tests/new/ConstructorExecInit.java | 2 | ||||
| -rw-r--r-- | tests/new/OddConstructors.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/new/AfterReturningParam.java b/tests/new/AfterReturningParam.java index 4010bf058..dd4e1fc37 100644 --- a/tests/new/AfterReturningParam.java +++ b/tests/new/AfterReturningParam.java @@ -4,7 +4,8 @@ public class AfterReturningParam { public static void main(String[] args) { AfterReturningParam p = new AfterReturningParam(); - Tester.checkAndClearEvents(new String[] { "constr exec as Object null" }); + // Tester.checkAndClearEvents(new String[] { "constr exec as Object null" }); + // see pr 103157 for reason why this no longer matches p.mInt(); Tester.checkAndClearEvents(new String[] { "int as Object 2" }); @@ -36,6 +37,7 @@ aspect A { callEvent("constr exec as constd object", o); } after() returning (Object o) : execution(AfterReturningParam.new()) { // CW 38 in 1.0.4, does match + // in 1.5 does not match - no return value for this jp callEvent("constr exec as Object", o); } after() returning (String o) : execution(AfterReturningParam.new()) { // CW 41 in 1.0.4, no match diff --git a/tests/new/ConstructorExecInit.java b/tests/new/ConstructorExecInit.java index 02b9bf293..e27fbc205 100644 --- a/tests/new/ConstructorExecInit.java +++ b/tests/new/ConstructorExecInit.java @@ -20,7 +20,7 @@ aspect A { after (Object target) : execution(*.new(..)) && target(target) && !within(A) { Tester.event("execution"); } - after () returning (Object target) : initialization(new(..)) && !this(A) { + after () returning : initialization(new(..)) && !this(A) { Tester.event("initialization"); } } diff --git a/tests/new/OddConstructors.java b/tests/new/OddConstructors.java index 72717d275..122e6719c 100644 --- a/tests/new/OddConstructors.java +++ b/tests/new/OddConstructors.java @@ -35,7 +35,7 @@ abstract aspect A { //&& initialization(new(..)) ; && initialization(I.new(..)) ; - after() returning(Object o): j() { + after() returning: j() { Tester.note("advised default constructor"); count++; } |