[jboss-cvs] JBossAS SVN: r64883 - 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
Sun Aug 26 23:55:19 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-08-26 23:55:19 -0400 (Sun, 26 Aug 2007)
New Revision: 64883
Removed:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/InvalidAspect.java
Modified:
projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsInvalidPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidTestCase.java
Log:
[JBAOP-387] Incorporated advices of InvalidAspect into ArgAspect and JoinPointAspect class.
Modified: projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml 2007-08-27 03:55:19 UTC (rev 64883)
@@ -200,6 +200,14 @@
<finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
</bind>
+ <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9Before6(..))">
+ <before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+ </bind>
+
+ <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9Around7(..))">
+ <around name="around7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+ </bind>
+
<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9After1(..))">
<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
</bind>
@@ -806,6 +814,10 @@
<throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
</bind>
+ <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->method5Around(..))">
+ <around name="around" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+ </bind>
+
<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->method5Finally4(..))">
<finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
</bind>
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspect.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspect.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -143,6 +143,11 @@
before5Q = q;
}
+ public void before6(@Arg int arg, @Args Object[] args)
+ {
+ Assert.fail("This advice should never be executed");
+ }
+
public int around1(@Arg int x, @Arg double y, @Arg float z, @Arg String str, @Arg long q)
{
Assert.fail("This advice should never be executed");
@@ -190,6 +195,12 @@
return Integer.valueOf(((Integer) invocation.invokeNext()).intValue() + 6);
}
+ public Object around7(@Arg int arg, @Args Object[] args) throws Throwable
+ {
+ Assert.fail("This advice should never be executed");
+ return CurrentInvocation.proceed();
+ }
+
public void after1(@Arg String str, @Arg(index = 0) int x)
{
after1 = true;
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -28,6 +28,7 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.jboss.aop.advice.InvalidAdviceException;
import org.jboss.aop.advice.NoMatchingAdviceException;
import org.jboss.aop.advice.annotation.ParameterAnnotationRuleException;
import org.jboss.test.aop.AOPTestWithSetup;
@@ -429,6 +430,28 @@
boolean thrown = false;
try
{
+ this.pojo.bunch9Before6(15, (double) 3.5, (float) 16, 131);
+ }
+ catch(InvalidAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ this.pojo.bunch9Around7(15, (double) 3.5, (float) 16, 131);
+ }
+ catch(InvalidAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
this.pojo.bunch9After1(15, (double) 3.5, (float) 16, 131);
}
catch(NoMatchingAdviceException e)
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsInvalidPOJO.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsInvalidPOJO.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -227,6 +227,16 @@
/* bunch9(int, double, float, int) */
+ public int bunch9Before6(int x, double y, float z, int q)
+ {
+ return x + (int) y * 9 + (int) z + q;
+ }
+
+ public int bunch9Around7(int x, double y, float z, int q)
+ {
+ return x + (int) y * 9 + (int) z + q;
+ }
+
public int bunch9After1(int x, double y, float z, int q)
{
return x + (int) y * 9 + (int) z + q;
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/InvalidAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/InvalidAspect.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/InvalidAspect.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.aop.beforeafterArgs;
-
-import junit.framework.Assert;
-
-import org.jboss.aop.advice.annotation.Arg;
-import org.jboss.aop.advice.annotation.Args;
-import org.jboss.aop.advice.annotation.JoinPoint;
-import org.jboss.aop.advice.annotation.Return;
-import org.jboss.aop.joinpoint.CurrentInvocation;
-import org.jboss.aop.joinpoint.Invocation;
-
-/**
- * Aspect whose advices must never be called.
- *
- * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- */
-/* TODO remove configuration from jboss-aop.xml file (in org.jboss.test.aop.args
- * and use it here
- */
-public class InvalidAspect
-{
- public void before(@JoinPoint Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void after(@JoinPoint Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing(@JoinPoint Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before1(@Arg int arg, @Args Object[] args)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public Object around1(@Arg int arg, @Args Object[] args) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return CurrentInvocation.proceed();
- }
-
- public void finally72(@Return String valueReturned)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void finally2(@Return String returnedValue)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void around1(Invocation invocation) throws Exception
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing7(Throwable throwable)
- {
- Assert.fail("This advice should never be executed");
- }
-}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -36,6 +36,7 @@
import org.jboss.aop.joinpoint.ConstructorCallByMethod;
import org.jboss.aop.joinpoint.ConstructorExecution;
import org.jboss.aop.joinpoint.FieldAccess;
+import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.JoinPointBean;
import org.jboss.aop.joinpoint.MethodCall;
import org.jboss.aop.joinpoint.MethodCallByConstructor;
@@ -121,6 +122,11 @@
Assert.fail("This advice should never be executed");
}
+ public void around(Invocation invocation) throws Exception
+ {
+ Assert.fail("This advice should never be executed");
+ }
+
public void after1(@JoinPoint FieldAccess joinPoint)
{
afterAdvice = "after1";
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidPOJO.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidPOJO.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -81,6 +81,11 @@
/* method5() */
+ public void method5Around() throws POJOException
+ {
+ throw new POJOException();
+ }
+
public void method5Finally4() throws POJOException
{
throw new POJOException();
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidTestCase.java 2007-08-26 14:35:51 UTC (rev 64882)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidTestCase.java 2007-08-27 03:55:19 UTC (rev 64883)
@@ -26,6 +26,7 @@
import junit.textui.TestRunner;
import org.jboss.aop.Advised;
+import org.jboss.aop.advice.InvalidAdviceException;
import org.jboss.aop.advice.NoMatchingAdviceException;
import org.jboss.aop.joinpoint.JoinPointBean;
import org.jboss.test.aop.AOPTestWithSetup;
@@ -170,6 +171,17 @@
boolean thrown = false;
try
{
+ pojo.method5Around();
+ }
+ catch (InvalidAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
pojo.method5Finally4();
}
catch (NoMatchingAdviceException e)
More information about the jboss-cvs-commits
mailing list