[jboss-cvs] JBossAS SVN: r58891 - in projects/aop/trunk/aop/src: resources/test/beforeafterArgs test/org/jboss/test/aop/beforeafterArgs
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 6 19:56:29 EST 2006
Author: flavia.rainone
Date: 2006-12-06 19:56:01 -0500 (Wed, 06 Dec 2006)
New Revision: 58891
Added:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Implementor.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Interface.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubInterface.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperInterface.java
Modified:
projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdvicePOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/POJOException.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubClass.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperClass.java
Log:
[JBAOP-37] Added a partical overloaded throwing advice tests (will complete these when specification of the thrown exception is implemented)
Modified: projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml 2006-12-07 00:56:01 UTC (rev 58891)
@@ -232,4 +232,10 @@
<after name="after54" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
<after name="after55" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
</bind>
+
+ <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect" scope="PER_VM"/>
+
+ <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method4(..))">
+ <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
+ </bind>
</aop>
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Implementor.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Implementor.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Implementor.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+/**
+ * Class used on before/after/throwing annotated parameter tests.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class Implementor implements SubInterface
+{}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Interface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Interface.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Interface.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -0,0 +1,31 @@
+/*
+ * 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;
+
+/**
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ *
+ */
+public interface Interface extends SuperInterface
+{
+
+}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdvicePOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdvicePOJO.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdvicePOJO.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -36,4 +36,14 @@
{
return null;
}
+
+ public void method3() throws POJOException
+ {
+ this.method4(null, null);
+ }
+
+ public void method4(SubInterface arg1, Implementor arg2) throws POJOException
+ {
+ throw new POJOException();
+ }
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -162,4 +162,14 @@
assertEquals("void,SuperValue", OverloadedAfterAspect.after54);
assertEquals("void", OverloadedAfterAspect.after55);
}
+
+ public void test4()
+ {
+ try
+ {
+ pojo.method3();
+ } catch (POJOException pe) {}
+ assertEquals("JoinPointInfo,Throwable,SubInterface,Implementor",
+ OverloadedThrowingAspect.throwing1);
+ }
}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -0,0 +1,502 @@
+/*
+ * 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 org.jboss.aop.JoinPointInfo;
+import org.jboss.aop.advice.annotation.Arg;
+import org.jboss.aop.advice.annotation.JoinPoint;
+import org.jboss.aop.advice.annotation.Thrown;
+
+/**
+ * Aspect used on overloaded throwing advice tests.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class OverloadedThrowingAspect
+{
+ static String throwing1 = null;
+
+ static void clear()
+ {
+ throwing1 = null;
+ }
+
+ // TODO finish this test when we can define the throwing to catch POJOException
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SubInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg Interface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Interface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SubInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SubInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SubInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SuperInterface arg,
+ @Arg Implementor implementor)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SuperInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SubInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SubInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg Interface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Interface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SuperInterface arg1,
+ @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SuperInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SuperInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SuperInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg Interface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Interface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SubInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SubInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SuperInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Interface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown POJOException thrown, @Arg SuperInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SuperInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SubInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg Interface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,Interface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SubInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SubInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SubInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SuperInterface arg,
+ @Arg Implementor implementor)
+ {
+ throwing1 = "JoinPointInfo,Exception,SuperInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SubInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SubInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg Interface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,Interface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SuperInterface arg1,
+ @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SuperInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SuperInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SuperInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg Interface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,Interface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SubInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SubInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SuperInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,Interface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Exception thrown, @Arg SuperInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Exception,SuperInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SubInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg Interface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Interface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SubInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SubInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SuperInterface arg,
+ @Arg Implementor implementor)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SuperInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SubInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg Interface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Interface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SuperInterface arg1,
+ @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SuperInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SuperInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg Interface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Interface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SubInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SubInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SuperInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Interface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Throwable thrown, @Arg SuperInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SubInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,Interface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SubInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SubInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SubInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SuperInterface arg,
+ @Arg Implementor implementor)
+ {
+ throwing1 = "JoinPointInfo,Object,SuperInterface,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SubInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,Interface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SuperInterface arg1,
+ @Arg SubInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Object arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SuperInterface,Object";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,Interface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SubInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SuperInterface,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,Interface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+ @Thrown Object thrown, @Arg SuperInterface arg1,
+ @Arg SuperInterface arg2)
+ {
+ throwing1 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown POJOException thrown, @Arg SubInterface arg1)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown POJOException thrown, @Arg Implementor arg1)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown POJOException thrown, @Arg Interface arg1)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown POJOException thrown, @Arg Object arg1)
+ {
+ throwing1 = "JoinPointInfo,POJOException,Object";
+ }
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown POJOException thrown, @Arg SuperInterface arg1)
+ {
+ throwing1 = "JoinPointInfo,POJOException,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Exception thrown, @Arg SubInterface arg1)
+ {
+ throwing1 = "JoinPointInfo,Exception,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Exception thrown, @Arg Implementor arg1)
+ {
+ throwing1 = "JoinPointInfo,Exception,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Exception thrown, @Arg Interface arg1)
+ {
+ throwing1 = "JoinPointInfo,Exception,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Exception thrown, @Arg Object arg1)
+ {
+ throwing1 = "JoinPointInfo,Exception,Object";
+ }
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Exception thrown, @Arg SuperInterface arg1)
+ {
+ throwing1 = "JoinPointInfo,Exception,SuperInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Throwable thrown, @Arg SubInterface arg1)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SubInterface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Throwable thrown, @Arg Implementor arg1)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Implementor";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Throwable thrown, @Arg Interface arg1)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Interface";
+ }
+
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Throwable thrown, @Arg Object arg1)
+ {
+ throwing1 = "JoinPointInfo,Throwable,Object";
+ }
+ public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+ @Thrown Throwable thrown, @Arg SuperInterface arg1)
+ {
+ throwing1 = "JoinPointInfo,Throwable,SuperInterface";
+ }
+
+ public void throwing1(@Thrown POJOException thrown)
+ {
+ throwing1 = "POJOException";
+ }
+
+ public void throwing1(@Thrown Exception thrown)
+ {
+ throwing1 = "Exception";
+ }
+
+ public void throwing1(@Thrown Throwable thrown)
+ {
+ throwing1 = "Throwable";
+ }
+
+ public void throwing1(@Thrown Object thrown)
+ {
+ throwing1 = "Object";
+ }
+}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/POJOException.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/POJOException.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/POJOException.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -22,7 +22,7 @@
package org.jboss.test.aop.beforeafterArgs;
/**
- * Class used on annotated parameter tests.
+ * Class used on before/after/throwing annotated parameter tests.
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnPOJO.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnPOJO.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -22,8 +22,8 @@
package org.jboss.test.aop.beforeafterArgs;
/**
- * Plain old java object used both on @Return parameter tests, and on advice return type
- * tests.
+ * Plain old java object used both on @Return parameter tests, and on advice return
+ * type tests.
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubClass.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubClass.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubClass.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -21,7 +21,10 @@
*/
package org.jboss.test.aop.beforeafterArgs;
+/**
+ * Class used on before/after/throwing annotated parameter tests.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
public class SubClass extends SuperClass
-{
-
-}
+{}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubInterface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubInterface.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubInterface.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ * Class used on before/after/throwing annotated parameter tests.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public interface SubInterface extends Interface
+{
+
+}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperClass.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperClass.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperClass.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -21,7 +21,10 @@
*/
package org.jboss.test.aop.beforeafterArgs;
+/**
+ * Class used on before/after/throwing annotated parameter tests.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
public class SuperClass
-{
-
-}
+{}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperInterface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperInterface.java 2006-12-06 23:08:54 UTC (rev 58890)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperInterface.java 2006-12-07 00:56:01 UTC (rev 58891)
@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+/**
+ * Class used on before/after/throwing annotated parameter tests.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public interface SuperInterface
+{}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list