aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorehilsdal <ehilsdal>2004-01-29 15:30:42 +0000
committerehilsdal <ehilsdal>2004-01-29 15:30:42 +0000
commit520ad8a1aa6073e38f99c90c35b085cba96c76ae (patch)
tree65b18bdcdfd5b175df7ba468cea15efc0d2c9f34 /tests
parent7cd8809a34dd3264b9c65b58d508c75cf534dfde (diff)
downloadaspectj-520ad8a1aa6073e38f99c90c35b085cba96c76ae.tar.gz
aspectj-520ad8a1aa6073e38f99c90c35b085cba96c76ae.zip
Fix for Bugzilla Bug 42668
effect of an after returning type incompatible with a join point return type
Diffstat (limited to 'tests')
-rw-r--r--tests/ajcTests.xml6
-rw-r--r--tests/ajcTestsFailing.xml7
-rw-r--r--tests/new/AfterReturningParamMatching.java7
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index e9ade4e18..57b496aaa 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7141,4 +7141,10 @@
<compile files="HandlerSig.java"/>
<run class="HandlerSig"/>
</ajc-test>
+
+ <ajc-test dir="new" pr="42668"
+ title="after returning with parameter: matching rules">
+ <compile files="AfterReturningParamMatching.java" />
+ <run class="AfterReturningParamMatching"/>
+ </ajc-test>
</suite>
diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index a64b4fb3c..cea32f4dd 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -119,13 +119,6 @@
</compile>
<run class="org.aspectj.langlib.PointcutsCW"/>
</ajc-test>
-
- <ajc-test dir="new"
- pr="42668"
- title="after returning with parameter: matching rules">
- <compile files="AfterReturningParamMatching.java" />
- <run class="AfterReturningParamMatching"/>
- </ajc-test>
<ajc-test dir="bugs/interAbstract"
pr="49784"
diff --git a/tests/new/AfterReturningParamMatching.java b/tests/new/AfterReturningParamMatching.java
index 062bfa541..4677eac09 100644
--- a/tests/new/AfterReturningParamMatching.java
+++ b/tests/new/AfterReturningParamMatching.java
@@ -5,16 +5,16 @@ import org.aspectj.testing.Tester;
public class AfterReturningParamMatching {
public static void main(String[] args) {
goBoolean(false);
- Tester.checkAndClearEvents(new String[] { "Object" });
+ Tester.checkAndClearEvents(new String[] { "boolean", "Object" });
goByte(1);
Tester.checkAndClearEvents(new String[] { "byte", "int", "long", "Object"});
goInt(2);
- Tester.checkAndClearEvents(new String[] { "byte", "int", "long", "Object" });
+ Tester.checkAndClearEvents(new String[] { "int", "long", "Object" });
goLong(3);
- Tester.checkAndClearEvents(new String[] { "byte", "int", "long", "Object" });
+ Tester.checkAndClearEvents(new String[] { "long", "Object" });
goObject(new Object());
Tester.checkAndClearEvents(new String[] { "Object" });
@@ -62,6 +62,7 @@ aspect A {
call(* goNumber(*)) ||
call(* goInteger(*));
+ after() returning(boolean b): methodsInQuestion() { Tester.event("boolean"); }
after() returning(byte b): methodsInQuestion() { Tester.event("byte"); }
after() returning(int b): methodsInQuestion() { Tester.event("int"); }
after() returning(long b): methodsInQuestion() { Tester.event("long"); }