[jboss-cvs] JBossAS SVN: r59849 - in projects/aop/trunk/aop/src: test/org/jboss/test/aop/beforeafterArgs and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 19 13:19:23 EST 2007
Author: flavia.rainone at jboss.com
Date: 2007-01-19 13:19:23 -0500 (Fri, 19 Jan 2007)
New Revision: 59849
Modified:
projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetCallerPOJO.java
Log:
[JBAOP-326] Added some advices that don't comply with target rules to check they're not being called
Modified: projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml 2007-01-19 17:52:54 UTC (rev 59848)
+++ projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml 2007-01-19 18:19:23 UTC (rev 59849)
@@ -200,8 +200,10 @@
<stack name="TargetAdvices">
<before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
<before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+ <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
<advice name="around1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
<advice name="around2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+ <advice name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
<after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
</stack>
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetAspect.java 2007-01-19 17:52:54 UTC (rev 59848)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetAspect.java 2007-01-19 18:19:23 UTC (rev 59849)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.beforeafterArgs;
+import junit.framework.Assert;
+
import org.jboss.aop.advice.annotation.Target;
import org.jboss.aop.joinpoint.CurrentInvocation;
@@ -65,6 +67,11 @@
before2 = true;
before2Target = target;
}
+
+ public void before3(@Target TargetAspect target)
+ {
+ Assert.fail("This advice should never be executed");
+ }
public Object around1() throws Throwable
{
@@ -79,12 +86,18 @@
return CurrentInvocation.proceed();
}
+ public Object around3(@Target ReturnPOJO target) throws Throwable
+ {
+ Assert.fail("This advice should never be executed");
+ return null;
+ }
+
public void after1()
{
after1 = true;
}
- public void after2(@Target Object target)
+ public void after2(@Target TargetCallerPOJO target)
{
after2 = true;
after2Target = target;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetCallerPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetCallerPOJO.java 2007-01-19 17:52:54 UTC (rev 59848)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetCallerPOJO.java 2007-01-19 18:19:23 UTC (rev 59849)
@@ -69,7 +69,7 @@
}
}
-class TargetCallerPOJO2
+class TargetCallerPOJO2 extends TargetCallerPOJO
{
public TargetCallerPOJO2(){}
public TargetCallerPOJO2(int x){}
More information about the jboss-cvs-commits
mailing list