[jboss-cvs] JBossAS SVN: r58817 - in projects/aop/trunk/aop/src: resources/test/args test/org/jboss/test/aop/args
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 1 23:09:41 EST 2006
Author: flaviarnn
Date: 2006-12-01 23:09:03 -0500 (Fri, 01 Dec 2006)
New Revision: 58817
Added:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJO.java
Removed:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdvicePOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJOException.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SubValue.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SuperValue.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownTestCase.java
Modified:
projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationTestCase.java
Log:
[JBAOP-37] Corrected test errors
Modified: projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/resources/test/args/jboss-aop.xml 2006-12-02 04:09:03 UTC (rev 58817)
@@ -2,189 +2,27 @@
<!DOCTYPE aop SYSTEM "jboss-aop_1_0.dtd">
<aop>
- <!-- @Invocation test -->
- <aspect class="org.jboss.test.aop.args.InvocationAspect" scope="PER_VM"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.InvocationPOJO->method1(..))">
- <before name="before" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- <advice name="aroundMethodExecution1" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- <after name="after" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- <throwing name="throwing" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.InvocationPOJO->method2(..))">
- <advice name="aroundMethodExecution2" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- </bind>
-
- <bind pointcut="get(* org.jboss.test.aop.args.InvocationPOJO->number)">
- <advice name="aroundFieldRead" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- </bind>
-
- <bind pointcut="set(* org.jboss.test.aop.args.InvocationPOJO->number)">
- <advice name="aroundFieldWrite" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- </bind>
-
- <bind pointcut="call(* org.jboss.test.aop.args.InvocationPOJO->calleeMethod(..)) AND
- withincode(* org.jboss.test.aop.args.InvocationPOJO->callerMethod(..))">
- <advice name="aroundMethodCalledByMethod" aspect="org.jboss.test.aop.args.InvocationAspect"/>
- </bind>
-
- <!-- @JoinPoint test -->
- <aspect class="org.jboss.test.aop.args.JoinPointAspect" scope="PER_VM"/>
-
- <bind pointcut="field(* org.jboss.test.aop.args.JoinPointPOJO->number)">
- <before name="before1" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- <after name="after1" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="set(* org.jboss.test.aop.args.JoinPointPOJO->text)">
- <before name="before2" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- <after name="after2" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="get(* org.jboss.test.aop.args.JoinPointPOJO->text)">
- <before name="before5" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- <after name="after5" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.JoinPointPOJO->method1(..))">
- <before name="before3" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- <after name="after3" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.JoinPointPOJO->method2(..))">
- <before name="before4" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- <after name="after4" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- <throwing name="throwing1" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.JoinPointPOJO->method3(..))">
- <throwing name="throwing2" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.JoinPointPOJO->method4(..))">
- <throwing name="throwing3" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.JoinPointPOJO->method5(..))">
- <throwing name="throwing4" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.JoinPointPOJO->method6(..))">
- <throwing name="throwing5" aspect="org.jboss.test.aop.args.JoinPointAspect"/>
- </bind>
-
- <!-- Return type and @Return test -->
- <aspect class="org.jboss.test.aop.args.ReturnAspect" scope="PER_VM"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method1(..))">
- <before name="before" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <advice name="around1" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after1" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method2(..))">
- <advice name="around2" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after2" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method3(..))">
- <before name="before" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <advice name="around3" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after3" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method4(..))">
- <advice name="around4" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after4" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method5(..))">
- <advice name="around5" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after5" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method6(..))">
- <advice name="around6" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after6" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method7(..))">
- <advice name="around7" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after7" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method8(..))">
- <before name="before" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <advice name="around8" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after8" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method9(..))">
- <advice name="around9" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after9" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method10(..))">
- <before name="before" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <advice name="around10" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after10" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ReturnPOJO->method11(..))">
- <advice name="around11" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- <after name="after11" aspect="org.jboss.test.aop.args.ReturnAspect"/>
- </bind>
-
- <!-- @Thrown test -->
- <aspect class="org.jboss.test.aop.args.ThrownAspect" scope="PER_VM"/>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ThrownPOJO->method1(..))">
- <throwing name="throwing1" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ThrownPOJO->method2(..))">
- <throwing name="throwing2" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ThrownPOJO->method3(..))">
- <throwing name="throwing3" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ThrownPOJO->method4(..))">
- <throwing name="throwing4" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ThrownPOJO->method5(..))">
- <throwing name="throwing5" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.args.ThrownPOJO->method6(..))">
- <throwing name="throwing6" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- <throwing name="throwing7" aspect="org.jboss.test.aop.args.ThrownAspect"/>
- </bind>
-
<!-- @Arg test -->
<aspect class="org.jboss.test.aop.args.ArgAspect" scope="PER_VM"/>
- <bind pointcut="execution(* org.jboss.test.aop.args.ArgPOJO->bunchArgs(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.args.POJO->bunchArgs(..))">
<advice name="bunchArgs" aspect="org.jboss.test.aop.args.ArgAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.args.ArgPOJO->bunchArgsWithInvocation(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.args.POJO->bunchArgsWithInvocation(..))">
<advice name="bunchArgsWithInvocation" aspect="org.jboss.test.aop.args.ArgAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.args.ArgPOJO->bunchWrapped(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.args.POJO->bunchWrapped(..))">
<advice name="wrap" aspect="org.jboss.test.aop.args.ArgAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.args.ArgPOJO->bunch(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.args.POJO->bunch(..))">
<advice name="bunch" aspect="org.jboss.test.aop.args.ArgAspect"/>
- <advice name="bunch1" aspect="org.jboss.test.aop.args.ArgAspect"/>
+<!-- <advice name="bunch1" aspect="org.jboss.test.aop.args.ArgAspect"/> -->
<advice name="bunch2" aspect="org.jboss.test.aop.args.ArgAspect"/>
- <advice name="bunch3" aspect="org.jboss.test.aop.args.ArgAspect"/>
- <advice name="bunch4" aspect="org.jboss.test.aop.args.ArgAspect"/>
+<!-- <advice name="bunch3" aspect="org.jboss.test.aop.args.ArgAspect"/>
+ <advice name="bunch4" aspect="org.jboss.test.aop.args.ArgAspect"/> -->
<advice name="arg1" aspect="org.jboss.test.aop.args.ArgAspect"/>
<advice name="arg2" aspect="org.jboss.test.aop.args.ArgAspect"/>
<advice name="arg3" aspect="org.jboss.test.aop.args.ArgAspect"/>
@@ -194,40 +32,35 @@
<advice name="emptyArg" aspect="org.jboss.test.aop.args.ArgAspect"/>
</bind>
- <bind pointcut="execution(java.lang.String org.jboss.test.aop.args.ArgPOJO->echo(java.lang.String))">
+ <bind pointcut="execution(java.lang.String org.jboss.test.aop.args.POJO->echo(java.lang.String))">
<advice name="echo" aspect="org.jboss.test.aop.args.ArgAspect"/>
</bind>
-
- <!-- overloaded advices test -->
- <aspect class="org.jboss.test.aop.args.OverloadedAdviceAspect" scope="PER_VM"/>
- <bind pointcut="field(* org.jboss.test.aop.args.OverloadedAdvicePOJO->text)">
- <before name="before1" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before2" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before3" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before4" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before5" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before6" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before7" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before8" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before9" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before10" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before11" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <before name="before12" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- </bind>
+ <!-- @Invocation test -->
+ <aspect class="org.jboss.test.aop.args.InvocationAspect" scope="PER_VM"/>
+
+ <bind pointcut="execution(* org.jboss.test.aop.args.POJO->method1(..))">
+<!-- <before name="before" aspect="org.jboss.test.aop.args.InvocationAspect"/> -->
+ <advice name="aroundMethodExecution1" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+<!-- <after name="after" aspect="org.jboss.test.aop.args.InvocationAspect"/> -->
+<!-- <throwing name="throwing" aspect="org.jboss.test.aop.args.InvocationAspect"/> -->
+ </bind>
+
+<!-- <bind pointcut="execution(* org.jboss.test.aop.args.POJO->method2(..))">
+ <advice name="aroundMethodExecution2" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+ </bind> -->
+
+ <bind pointcut="get(* org.jboss.test.aop.args.POJO->number)">
+ <advice name="aroundFieldRead" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+ </bind>
+
+ <bind pointcut="set(* org.jboss.test.aop.args.POJO->number)">
+ <advice name="aroundFieldWrite" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+ </bind>
- <bind pointcut="execution(* org.jboss.test.aop.args.OverloadedAdvicePOJO->method(int,long))">
- <advice name="around1" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around2" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around3" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around4" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around5" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around6" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around7" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around8" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around9" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around10" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around11" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- <advice name="around12" aspect="org.jboss.test.aop.args.OverloadedAdviceAspect"/>
- </bind>
+ <bind pointcut="call(* org.jboss.test.aop.args.POJO->calleeMethod(..)) AND
+ withincode(* org.jboss.test.aop.args.POJO->callerMethod(..))">
+ <advice name="aroundMethodCalledByMethod" aspect="org.jboss.test.aop.args.InvocationAspect"/>
+ </bind>
+
</aop>
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgPOJO.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgPOJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,56 +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.args;
-
-/**
- * Plain old java object used on @Arg parameter tests.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class ArgPOJO implements ArgPOJOInterface
-{
- public String echo(String echo)
- {
- return echo;
- }
-
- public int bunch(int x, double y, float z, String str, int q)
- {
- return x + (int) y + (int) z + q;
- }
-
- public int bunchArgs(int x, double y, float z, String str, int q)
- {
- return x + (int) y + (int) z + q;
- }
-
- public int bunchArgsWithInvocation(int x, double y, float z, String str, int q)
- {
- return x + (int) y + (int) z + q;
- }
-
- public int bunchWrapped(int x, double y, float z, String str, int q)
- {
- return x + (int) y + (int) z + q;
- }
-}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgTestCase.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgTestCase.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -36,7 +36,7 @@
*/
public class ArgTestCase extends AOPTestWithSetup
{
- ArgPOJO pojo;
+ POJO pojo;
public static void main(String[] args)
{
@@ -58,7 +58,7 @@
public void setUp() throws Exception
{
super.setUp();
- pojo = new ArgPOJO();
+ pojo = new POJO();
ArgAspect.clear();
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationAspect.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationAspect.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,3 +1,24 @@
+/*
+ * 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.args;
import junit.framework.Assert;
@@ -10,7 +31,7 @@
/**
* Aspect used on @org.jboss.aop.advice.annotation.Invocation parameter tests.
*
- * @author Flavia Rainone
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
public class InvocationAspect
{
@@ -23,21 +44,6 @@
invokeReturn = null;
}
- public void before(@org.jboss.aop.advice.annotation.Invocation Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void after(@org.jboss.aop.advice.annotation.Invocation Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing(@org.jboss.aop.advice.annotation.Invocation Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
public Object aroundMethodExecution1()
{
advice = "aroundMethodExecution1";
@@ -67,7 +73,7 @@
return null;
}
- public int aroundFieldRead(@org.jboss.aop.advice.annotation.Invocation
+ public Object aroundFieldRead(@org.jboss.aop.advice.annotation.Invocation
FieldReadInvocation invocation) throws Throwable
{
advice = "aroundFieldRead";
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationPOJO.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationPOJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,32 +0,0 @@
-package org.jboss.test.aop.args;
-
-/**
- * Plain old java object used on @org.jboss.aop.advice.annotation.Invocation parameter
- * tests.
- *
- * @author Flavia Rainone
- */
-public class InvocationPOJO
-{
- public int number;
-
- public int callerMethod(int i)
- {
- return calleeMethod(i);
- }
-
- private int calleeMethod(int i)
- {
- return i*2;
- }
-
- public String method1()
- {
- return "method";
- }
-
- public int method2()
- {
- return 2;
- }
-}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationTestCase.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/InvocationTestCase.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,3 +1,24 @@
+/*
+ * 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.args;
import org.jboss.test.aop.AOPTestWithSetup;
@@ -9,11 +30,11 @@
/**
* Tests the use of @org.jboss.aop.advice.annotation.Invocation parameters.
*
- * @author Flavia Rainone
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
public class InvocationTestCase extends AOPTestWithSetup
{
- private InvocationPOJO pojo;
+ private POJO pojo;
public static void main(String[] args)
{
@@ -36,7 +57,7 @@
{
super.setUp();
InvocationAspect.clear();
- this.pojo = new InvocationPOJO();
+ this.pojo = new POJO();
}
public void test1()
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointAspect.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointAspect.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,121 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Assert;
-
-import org.jboss.aop.ConstructorInfo;
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.JoinPointInfo;
-import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.annotation.JoinPoint;
-import org.jboss.aop.advice.annotation.Thrown;
-
-/**
- * Aspect used on @JoinPoint parameter tests.
- *
- * @author Flavia Rainone
- */
-public class JoinPointAspect
-{
- static String beforeAdvice = null;
- static JoinPointInfo beforeJoinPointInfo = null;
- static String afterAdvice = null;
- static JoinPointInfo afterJoinPointInfo = null;
- static String throwingAdvice = null;
- static JoinPointInfo throwingJoinPointInfo = null;
-
- public static void clear()
- {
- beforeAdvice = null;
- beforeJoinPointInfo = null;
- afterAdvice = null;
- afterJoinPointInfo = null;
- throwingAdvice = null;
- throwingJoinPointInfo = null;
- }
-
- public void before1()
- {
- beforeAdvice = "before1";
- }
-
- public void before2(@JoinPoint Object joinPointInfo)
- {
- beforeAdvice = "before2";
- beforeJoinPointInfo = (JoinPointInfo) joinPointInfo;
- }
-
- public void before3(@JoinPoint JoinPointInfo joinPointInfo)
- {
- beforeAdvice = "before3";
- beforeJoinPointInfo = joinPointInfo;
- }
-
- public void before4(@JoinPoint MethodInfo joinPointInfo)
- {
- beforeAdvice = "before4";
- beforeJoinPointInfo = (JoinPointInfo) joinPointInfo;
- }
-
- public void before5(@JoinPoint MethodInfo joinPointInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void after1(@JoinPoint FieldInfo joinPointInfo)
- {
- afterAdvice = "after1";
- afterJoinPointInfo = joinPointInfo;
- }
-
- public void after2(@JoinPoint ConstructorInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void after3()
- {
- afterAdvice = "after3";
- }
-
- public void after4(@JoinPoint Object joinPointInfo)
- {
- afterAdvice = "after4";
- afterJoinPointInfo = (JoinPointInfo) joinPointInfo;
- }
-
- public void after5(@JoinPoint JoinPointInfo joinPointInfo)
- {
- afterAdvice = "after5";
- afterJoinPointInfo = joinPointInfo;
- }
-
- public void throwing1(@Thrown Throwable throwable, @JoinPoint Object joinPointInfo)
- {
- throwingAdvice = "throwing1";
- throwingJoinPointInfo = (JoinPointInfo) joinPointInfo;
- }
-
- public void throwing2(@JoinPoint ConstructorInfo joinPointInfo,
- @Thrown Throwable throwable)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing3(@Thrown Throwable throwable,
- @JoinPoint JoinPointInfo joinPointInfo)
- {
- throwingAdvice = "throwing3";
- throwingJoinPointInfo = joinPointInfo;
- }
-
- public void throwing4(@Thrown Throwable throwable)
- {
- throwingAdvice = "throwing4";
- }
-
- public void throwing5(@JoinPoint MethodInfo joinPointInfo, @Thrown Throwable throwable)
- {
- throwingAdvice = "throwing5";
- throwingJoinPointInfo = joinPointInfo;
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointPOJO.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointPOJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,46 +0,0 @@
-package org.jboss.test.aop.args;
-
-/**
- * Plain old java object used on @JoinPoint parameter tests.
- *
- * @author Flavia Rainone
- */
-public class JoinPointPOJO
-{
- public int number;
- public String text;
-
- public void method1()
- {
-
- }
-
- public String method2(boolean shouldThrow) throws POJOException
- {
- if (shouldThrow)
- {
- throw new POJOException();
- }
- return "method3";
- }
-
- public void method3() throws POJOException
- {
- throw new POJOException();
- }
-
- public void method4() throws POJOException
- {
- throw new POJOException();
- }
-
- public void method5() throws POJOException
- {
- throw new POJOException();
- }
-
- public void method6() throws POJOException
- {
- throw new POJOException();
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointTestCase.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/JoinPointTestCase.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,227 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.MethodInfo;
-import org.jboss.test.aop.AOPTestWithSetup;
-
-/**
- * Tests the use of @JoinPoint parameters.
- *
- * @author Flavia Rainone
- */
-public class JoinPointTestCase extends AOPTestWithSetup
-{
- private JoinPointPOJO pojo;
-
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("JoinPointTestCase");
- suite.addTestSuite(JoinPointTestCase.class);
- return suite;
- }
-
- public JoinPointTestCase(String name)
- {
- super(name);
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- JoinPointAspect.clear();
- this.pojo = new JoinPointPOJO();
- }
-
- public void test1()
- {
- pojo.number = 0;
- assertEquals("before1", JoinPointAspect.beforeAdvice);
- assertNull(JoinPointAspect.beforeJoinPointInfo);
- assertEquals("after1", JoinPointAspect.afterAdvice);
- assertNotNull(JoinPointAspect.afterJoinPointInfo);
- assertTrue(JoinPointAspect.afterJoinPointInfo instanceof FieldInfo);
- FieldInfo fieldInfo = (FieldInfo) JoinPointAspect.afterJoinPointInfo;
- assertEquals("number", fieldInfo.getAdvisedField().getName());
- assertFalse(fieldInfo.isRead());
- }
-
- public void test2()
- {
- pojo.text = "test2";
- assertEquals("before2", JoinPointAspect.beforeAdvice);
- assertNotNull(JoinPointAspect.beforeJoinPointInfo);
- assertNull(JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
-
- assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof FieldInfo);
- FieldInfo fieldInfo = (FieldInfo) JoinPointAspect.beforeJoinPointInfo;
- assertEquals("text", fieldInfo.getAdvisedField().getName());
- assertFalse(fieldInfo.isRead());
- }
-
- public void test3()
- {
- String text = pojo.text;
- assertNull(JoinPointAspect.beforeAdvice);
- assertNull(JoinPointAspect.beforeJoinPointInfo);
- assertEquals("after5", JoinPointAspect.afterAdvice);
- assertNotNull(JoinPointAspect.afterJoinPointInfo);
- assertTrue(JoinPointAspect.afterJoinPointInfo instanceof FieldInfo);
- FieldInfo fieldInfo = (FieldInfo) JoinPointAspect.afterJoinPointInfo;
- assertEquals("text", fieldInfo.getAdvisedField().getName());
- assertTrue(fieldInfo.isRead());
- }
-
- public void test4()
- {
- pojo.method1();
- assertEquals("before3", JoinPointAspect.beforeAdvice);
- assertNotNull(JoinPointAspect.beforeJoinPointInfo);
- assertEquals("after3", JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
- assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
- assertEquals("method1", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
- getAdvisedMethod().getName());
- }
-
- public void test5() throws POJOException
- {
- pojo.method2(false);
- assertEquals("before4", JoinPointAspect.beforeAdvice);
- assertNotNull(JoinPointAspect.beforeJoinPointInfo);
- assertEquals("after4", JoinPointAspect.afterAdvice);
- assertNotNull(JoinPointAspect.afterJoinPointInfo);
- assertNull(JoinPointAspect.throwingAdvice);
- assertNull(JoinPointAspect.throwingJoinPointInfo);
- assertSame(JoinPointAspect.beforeJoinPointInfo, JoinPointAspect.afterJoinPointInfo);
- assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
- assertEquals("method2", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
- getAdvisedMethod().getName());
- }
-
- public void test6() throws POJOException
- {
- boolean exceptionThrown = false;
- try
- {
- pojo.method2(true);
- }
- catch (POJOException e)
- {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
-
- assertEquals("before4", JoinPointAspect.beforeAdvice);
- assertNotNull(JoinPointAspect.beforeJoinPointInfo);
- assertNull(JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
- assertEquals("throwing1", JoinPointAspect.throwingAdvice);
- assertNotNull(JoinPointAspect.throwingJoinPointInfo);
- assertSame(JoinPointAspect.beforeJoinPointInfo,
- JoinPointAspect.throwingJoinPointInfo);
- assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
- assertEquals("method2", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
- getAdvisedMethod().getName());
- }
-
- public void test7() throws POJOException
- {
- boolean exceptionThrown = false;
- try
- {
- pojo.method3();
- }
- catch (POJOException e)
- {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
-
- assertNull(JoinPointAspect.beforeAdvice);
- assertNull(JoinPointAspect.beforeJoinPointInfo);
- assertNull(JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
- assertNull(JoinPointAspect.throwingAdvice);
- assertNull(JoinPointAspect.throwingJoinPointInfo);
- }
-
- public void test8() throws POJOException
- {
- boolean exceptionThrown = false;
- try
- {
- pojo.method4();
- }
- catch (POJOException e)
- {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
-
- assertNull(JoinPointAspect.beforeAdvice);
- assertNull(JoinPointAspect.beforeJoinPointInfo);
- assertNull(JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
- assertEquals("throwing3", JoinPointAspect.throwingAdvice);
- assertNotNull(JoinPointAspect.throwingJoinPointInfo);
- assertTrue(JoinPointAspect.throwingJoinPointInfo instanceof MethodInfo);
- assertEquals("method4", ((MethodInfo) JoinPointAspect.throwingJoinPointInfo).
- getAdvisedMethod().getName());
- }
-
- public void test9() throws POJOException
- {
- boolean exceptionThrown = false;
- try
- {
- pojo.method5();
- }
- catch (POJOException e)
- {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
-
- assertNull(JoinPointAspect.beforeAdvice);
- assertNull(JoinPointAspect.beforeJoinPointInfo);
- assertNull(JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
- assertEquals("throwing4", JoinPointAspect.throwingAdvice);
- assertNull(JoinPointAspect.throwingJoinPointInfo);
- }
-
- public void test10() throws POJOException
- {
- boolean exceptionThrown = false;
- try
- {
- pojo.method6();
- }
- catch (POJOException e)
- {
- exceptionThrown = true;
- }
- assertTrue(exceptionThrown);
-
- assertNull(JoinPointAspect.beforeAdvice);
- assertNull(JoinPointAspect.beforeJoinPointInfo);
- assertNull(JoinPointAspect.afterAdvice);
- assertNull(JoinPointAspect.afterJoinPointInfo);
- assertEquals("throwing5", JoinPointAspect.throwingAdvice);
- assertNotNull(JoinPointAspect.throwingJoinPointInfo);
- assertTrue(JoinPointAspect.throwingJoinPointInfo instanceof MethodInfo);
- assertEquals("method6", ((MethodInfo) JoinPointAspect.throwingJoinPointInfo).
- getAdvisedMethod().getName());
-
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceAspect.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceAspect.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,1333 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Assert;
-
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.JoinPointInfo;
-import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.annotation.Arg;
-import org.jboss.aop.advice.annotation.JoinPoint;
-import org.jboss.aop.joinpoint.ConstructorInvocation;
-import org.jboss.aop.joinpoint.CurrentInvocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-
-/**
- * Aspect used on overloaded advice tests.
- *
- * @author Flavia Rainone
- */
-public class OverloadedAdviceAspect
-{
- static String before1 = null;
- static String before2 = null;
- static String before3 = null;
- static String before4 = null;
- static String before5 = null;
- static String before6 = null;
- static String before7 = null;
- static String before8 = null;
- static String before9 = null;
- static String before10 = null;
- static String before11 = null;
- static String before12 = null;
-
- static String around1 = null;
- static String around2 = null;
- static String around3 = null;
- static String around4 = null;
- static String around5 = null;
- static String around6 = null;
- static String around7 = null;
- static String around8 = null;
- static String around9 = null;
- static String around10 = null;
- static String around11 = null;
- static String around12 = null;
-
- public static void clear()
- {
- before1 = null;
- before2 = null;
- before3 = null;
- before4 = null;
- before5 = null;
- before6 = null;
- before7 = null;
- before8 = null;
- before9 = null;
- before10 = null;
- before11 = null;
- before12 = null;
-
- around1 = null;
- around2 = null;
- around3 = null;
- around4 = null;
- around5 = null;
- around6 = null;
- around7 = null;
- around8 = null;
- around9 = null;
- around10 = null;
- around11 = null;
- around12 = null;
- }
-
- /* BEFORE ADVICES */
-
- public void before1(@JoinPoint FieldInfo joinPointInfo, @Arg String text)
- {
- before1 = "FieldInfo,String";
- }
-
- public void before1(@JoinPoint FieldInfo joinPointInfo, @Arg Object text)
- {
- before1 = "FieldInfo,Object";
- }
-
- public void before1(@JoinPoint JoinPointInfo joinPointInfo, @Arg String text)
- {
- before1 = "JoinPointInfo,String";
- }
-
- public void before1(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
- {
- before1 = "JoinPointInfo,Object";
- }
-
- public void before1(@JoinPoint Object joinPointInfo, @Arg String text)
- {
- before1 = "Object,String";
- }
-
- public void before1(@JoinPoint Object joinPointInfo, @Arg Object text)
- {
- before1 = "Object,Object";
- }
-
- public void before1(@JoinPoint FieldInfo joinPointInfo)
- {
- before1 = "FieldInfo";
- }
-
- public void before1(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before1 = "JoinPointInfo";
- }
-
- public void before1(@JoinPoint Object joinPointInfo)
- {
- before1 = "Object";
- }
-
- public void before1(@Arg String text)
- {
- before1 = "String";
- }
-
- public void before1()
- {
- before1 = "";
- }
-
- public void before1(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before1(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before2(@JoinPoint FieldInfo joinPointInfo, @Arg Object text)
- {
- before2 = "FieldInfo,Object";
- }
-
- public void before2(@JoinPoint JoinPointInfo joinPointInfo, @Arg String text)
- {
- before2 = "JoinPointInfo,String";
- }
-
- public void before2(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
- {
- before2 = "JoinPointInfo,Object";
- }
-
- public void before2(@JoinPoint Object joinPointInfo, @Arg String text)
- {
- before2 = "Object,String";
- }
-
- public void before2(@JoinPoint Object joinPointInfo, @Arg Object text)
- {
- before2 = "Object,Object";
- }
-
- public void before2(@JoinPoint FieldInfo joinPointInfo)
- {
- before2 = "FieldInfo";
- }
-
- public void before2(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before2 = "JoinPointInfo";
- }
-
- public void before2(@JoinPoint Object joinPointInfo)
- {
- before2 = "Object";
- }
-
- public void before2(@Arg String text)
- {
- before2 = "String";
- }
-
- public void before2()
- {
- before2 = "";
- }
-
- public void before2(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before2(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before3(@JoinPoint JoinPointInfo joinPointInfo, @Arg String text)
- {
- before3 = "JoinPointInfo,String";
- }
-
- public void before3(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
- {
- before3 = "JoinPointInfo,Object";
- }
-
- public void before3(@JoinPoint Object joinPointInfo, @Arg String text)
- {
- before3 = "Object,String";
- }
-
- public void before3(@JoinPoint Object joinPointInfo, @Arg Object text)
- {
- before3 = "Object,Object";
- }
-
- public void before3(@JoinPoint FieldInfo joinPointInfo)
- {
- before3 = "FieldInfo";
- }
-
- public void before3(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before3 = "JoinPointInfo";
- }
-
- public void before3(@JoinPoint Object joinPointInfo)
- {
- before3 = "Object";
- }
-
- public void before3(@Arg String text)
- {
- before3 = "String";
- }
-
- public void before3()
- {
- before3 = "";
- }
-
- public void before3(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before3(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before4(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
- {
- before4 = "JoinPointInfo,Object";
- }
-
- public void before4(@JoinPoint Object joinPointInfo, @Arg String text)
- {
- before4 = "Object,String";
- }
-
- public void before4(@JoinPoint Object joinPointInfo, @Arg Object text)
- {
- before4 = "Object,Object";
- }
-
- public void before4(@JoinPoint FieldInfo joinPointInfo)
- {
- before4 = "FieldInfo";
- }
-
- public void before4(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before4 = "JoinPointInfo";
- }
-
- public void before4(@JoinPoint Object joinPointInfo)
- {
- before4 = "Object";
- }
-
- public void before4(@Arg String text)
- {
- before4 = "String";
- }
-
- public void before4()
- {
- before4 = "";
- }
-
- public void before4(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before4(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before5(@JoinPoint Object joinPointInfo, @Arg String text)
- {
- before5 = "Object,String";
- }
-
- public void before5(@JoinPoint Object joinPointInfo, @Arg Object text)
- {
- before5 = "Object,Object";
- }
-
- public void before5(@JoinPoint FieldInfo joinPointInfo)
- {
- before5 = "FieldInfo";
- }
-
- public void before5(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before5 = "JoinPointInfo";
- }
-
- public void before5(@JoinPoint Object joinPointInfo)
- {
- before5 = "Object";
- }
-
- public void before5(@Arg String text)
- {
- before5 = "String";
- }
-
- public void before5()
- {
- before5 = "";
- }
-
- public void before5(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before5(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before6(@JoinPoint Object joinPointInfo, @Arg Object text)
- {
- before6 = "Object,Object";
- }
-
- public void before6(@JoinPoint FieldInfo joinPointInfo)
- {
- before6 = "FieldInfo";
- }
-
- public void before6(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before6 = "JoinPointInfo";
- }
-
- public void before6(@JoinPoint Object joinPointInfo)
- {
- before6 = "Object";
- }
-
- public void before6(@Arg String text)
- {
- before6 = "String";
- }
-
- public void before6()
- {
- before6 = "";
- }
-
- public void before6(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before6(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before7(@JoinPoint FieldInfo joinPointInfo)
- {
- before7 = "FieldInfo";
- }
-
- public void before7(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before7 = "JoinPointInfo";
- }
-
- public void before7(@JoinPoint Object joinPointInfo)
- {
- before7 = "Object";
- }
-
- public void before7(@Arg String text)
- {
- before7 = "String";
- }
-
- public void before7()
- {
- before7 = "";
- }
-
- public void before7(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before7(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before8(@JoinPoint JoinPointInfo joinPointInfo)
- {
- before8 = "JoinPointInfo";
- }
-
- public void before8(@JoinPoint Object joinPointInfo)
- {
- before8 = "Object";
- }
-
- public void before8(@Arg String text)
- {
- before8 = "String";
- }
-
- public void before8()
- {
- before8 = "";
- }
-
- public void before8(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before8(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before9(@JoinPoint Object joinPointInfo)
- {
- before9 = "Object";
- }
-
- public void before9(@Arg String text)
- {
- before9 = "String";
- }
-
- public void before9()
- {
- before9 = "";
- }
-
- public void before9(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before9(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before10(@Arg String text)
- {
- before10 = "String";
- }
-
- public void before10(@Arg Object text)
- {
- before10 = "Object";
- }
-
- public void before10()
- {
- before10 = "";
- }
-
- public void before10(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before10(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before11(@Arg Object text)
- {
- before11 = "Object";
- }
-
- public void before11()
- {
- before11 = "";
- }
-
- public void before11(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before11(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before12()
- {
- before12 = "";
- }
-
- public void before12(@JoinPoint MethodInfo constructorInfo)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void before12(@Arg SuperValue text)
- {
- Assert.fail("This advice should never be executed");
- }
-
- /* AROUND ADVICES */
-
- public Object around1(Invocation invocation) throws Throwable
- {
- around1 = "defaultSignature";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around1 = "MethodInvocation,int,long";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around1 = "Invocation,int,long";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around1 = "Object,int,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1) throws Throwable
- {
- around1 = "MethodInvocation,int";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg long arg2) throws Throwable
- {
- around1 = "MethodInvocation,long";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1) throws Throwable
- {
- around1 = "Invocation,int";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg long arg2) throws Throwable
- {
- around1 = "Invocation,long";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around1 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around1 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around1 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around1 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around1(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around1 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around1(@Arg int arg1) throws Throwable
- {
- around1 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around1(@Arg long arg2) throws Throwable
- {
- around1 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around1() throws Throwable
- {
- around1 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around1(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around2 = "MethodInvocation,int,long";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around2 = "Invocation,int,long";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around2 = "Object,int,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1) throws Throwable
- {
- around2 = "MethodInvocation,int";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg long arg2) throws Throwable
- {
- around2 = "MethodInvocation,long";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1) throws Throwable
- {
- around2 = "Invocation,int";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg long arg2) throws Throwable
- {
- around2 = "Invocation,long";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around2 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around2 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around2 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around2 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around2(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around2 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around2(@Arg int arg1) throws Throwable
- {
- around2 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around2(@Arg long arg2) throws Throwable
- {
- around2 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around2() throws Throwable
- {
- around2 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around2(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around3 = "Invocation,int,long";
- return invocation.invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around3 = "Object,int,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1) throws Throwable
- {
- around3 = "MethodInvocation,int";
- return invocation.invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg long arg2) throws Throwable
- {
- around3 = "MethodInvocation,long";
- return invocation.invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1) throws Throwable
- {
- around3 = "Invocation,int";
- return invocation.invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg long arg2) throws Throwable
- {
- around3 = "Invocation,long";
- return invocation.invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around3 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around3 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around3 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around3 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around3(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around3 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around3(@Arg int arg1) throws Throwable
- {
- around3 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around3(@Arg long arg2) throws Throwable
- {
- around3 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around3() throws Throwable
- {
- around3 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around3(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1, @Arg long arg2) throws Throwable
- {
- around4 = "Object,int,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1) throws Throwable
- {
- around4 = "MethodInvocation,int";
- return invocation.invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg long arg2) throws Throwable
- {
- around4 = "MethodInvocation,long";
- return invocation.invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1) throws Throwable
- {
- around4 = "Invocation,int";
- return invocation.invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg long arg2) throws Throwable
- {
- around4 = "Invocation,long";
- return invocation.invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around4 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around4 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around4 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around4 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around4(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around4 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around4(@Arg int arg1) throws Throwable
- {
- around4 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around4(@Arg long arg2) throws Throwable
- {
- around4 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around4() throws Throwable
- {
- around4 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg int arg1) throws Throwable
- {
- around5 = "MethodInvocation,int";
- return invocation.invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation, @Arg long arg2) throws Throwable
- {
- around5 = "MethodInvocation,long";
- return invocation.invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1) throws Throwable
- {
- around5 = "Invocation,int";
- return invocation.invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg long arg2) throws Throwable
- {
- around5 = "Invocation,long";
- return invocation.invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around5 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around5 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around5 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around5 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around5(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around5 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around5(@Arg int arg1) throws Throwable
- {
- around5 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around5(@Arg long arg2) throws Throwable
- {
- around5 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around5() throws Throwable
- {
- around5 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around5(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around6(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg int arg1) throws Throwable
- {
- around6 = "Invocation,int";
- return invocation.invokeNext();
- }
-
- public Object aroun6(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation, @Arg long arg2) throws Throwable
- {
- around6 = "Invocation,long";
- return invocation.invokeNext();
- }
-
- public Object around6(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around6 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around6(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around6 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around6(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around6 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around6(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around6 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around6(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around6 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around6(@Arg int arg1) throws Throwable
- {
- around6 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around6(@Arg long arg2) throws Throwable
- {
- around6 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around6() throws Throwable
- {
- around6 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around6(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around7(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg int arg1) throws Throwable
- {
- around7 = "Object,int";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around7(@org.jboss.aop.advice.annotation.Invocation
- Object invocation, @Arg long arg2) throws Throwable
- {
- around7 = "Object,long";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around7(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around7 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around7(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around7 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around7(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around7 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around7(@Arg int arg1) throws Throwable
- {
- around7 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around7(@Arg long arg2) throws Throwable
- {
- around7 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around7() throws Throwable
- {
- around7 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around7(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around8(@org.jboss.aop.advice.annotation.Invocation
- MethodInvocation invocation) throws Throwable
- {
- around8 = "MethodInvocation";
- return invocation.invokeNext();
- }
-
- public Object around8(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around8 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around8(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around8 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around8(@Arg int arg1) throws Throwable
- {
- around8 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around8(@Arg long arg2) throws Throwable
- {
- around8 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around8() throws Throwable
- {
- around8 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around8(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around9(@org.jboss.aop.advice.annotation.Invocation
- Object invocation) throws Throwable
- {
- around9 = "Object";
- return ((Invocation) invocation).invokeNext();
- }
-
- public Object around9(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around9 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around9(@Arg int arg1) throws Throwable
- {
- around9 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around9(@Arg long arg2) throws Throwable
- {
- around9 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around9() throws Throwable
- {
- around9 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around9(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around10(@Arg int arg1, @Arg long arg2) throws Throwable
- {
- around10 = "int,long";
- return CurrentInvocation.proceed();
- }
-
- public Object around10(@Arg int arg1) throws Throwable
- {
- around10 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around10(@Arg long arg2) throws Throwable
- {
- around10 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around10() throws Throwable
- {
- around10 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around10(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around11(@Arg int arg1) throws Throwable
- {
- around11 = "int";
- return CurrentInvocation.proceed();
- }
-
- public Object around11(@Arg long arg2) throws Throwable
- {
- around11 = "long";
- return CurrentInvocation.proceed();
- }
-
- public Object around11() throws Throwable
- {
- around11 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around11(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public Object around12() throws Throwable
- {
- around12 = "";
- return CurrentInvocation.proceed();
- }
-
- public Object around12(@org.jboss.aop.advice.annotation.Invocation
- ConstructorInvocation invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdvicePOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdvicePOJO.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdvicePOJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,13 +0,0 @@
-package org.jboss.test.aop.args;
-
-/**
- * Plain old java object used on overloaded advice tests.
- *
- * @author Flavia Rainone
- */
-public class OverloadedAdvicePOJO
-{
- public String text;
-
- public void method(int arg1, long arg2) {}
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceTestCase.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/OverloadedAdviceTestCase.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,82 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.jboss.test.aop.AOPTestWithSetup;
-
-/**
- * Tests the selection of advice methods when these are overloaded.
- *
- * @author Flavia Rainone
- */
-public class OverloadedAdviceTestCase extends AOPTestWithSetup
-{
- private OverloadedAdvicePOJO pojo;
-
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("OverloadedAdviceTestCase");
- suite.addTestSuite(OverloadedAdviceTestCase.class);
- return suite;
- }
-
- public OverloadedAdviceTestCase(String name)
- {
- super(name);
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- OverloadedAdviceAspect.clear();
- this.pojo = new OverloadedAdvicePOJO();
- }
-
- public void test1()
- {
- pojo.method(10, 15);
- assertEquals("defaultSignature", OverloadedAdviceAspect.around1);
- assertEquals("MethodInvocation,int,long", OverloadedAdviceAspect.around2);
- assertEquals("Invocation,int,long", OverloadedAdviceAspect.around3);
- assertEquals("Object,int,long", OverloadedAdviceAspect.around4);
- assertTrue(OverloadedAdviceAspect.around5.startsWith("MethodInvocation,"));
- assertTrue(OverloadedAdviceAspect.around5.equals("MethodInvocation,int") ||
- OverloadedAdviceAspect.around5.equals("MethodInvocation,long"));
- assertTrue(OverloadedAdviceAspect.around6.startsWith("Invocation,"));
- assertTrue(OverloadedAdviceAspect.around6.equals("Invocation,int") ||
- OverloadedAdviceAspect.around6.equals("Invocation,long"));
- assertTrue(OverloadedAdviceAspect.around7.startsWith("Object,"));
- assertTrue(OverloadedAdviceAspect.around7.equals("Object,int") ||
- OverloadedAdviceAspect.around7.equals("Object,long"));
- assertEquals("MethodInvocation", OverloadedAdviceAspect.around8);
- assertEquals("Object", OverloadedAdviceAspect.around9);
- assertEquals("int,long", OverloadedAdviceAspect.around10);
- assertTrue(OverloadedAdviceAspect.around11.equals("int") ||
- OverloadedAdviceAspect.around11.equals("long"));
- assertEquals("", OverloadedAdviceAspect.around12);
- }
-
- public void test2()
- {
- pojo.text = "test2";
- assertEquals("FieldInfo,String", OverloadedAdviceAspect.before1);
- assertEquals("FieldInfo,Object", OverloadedAdviceAspect.before2);
- assertEquals("JoinPointInfo,String", OverloadedAdviceAspect.before3);
- assertEquals("JoinPointInfo,Object", OverloadedAdviceAspect.before4);
- assertEquals("Object,String", OverloadedAdviceAspect.before5);
- assertEquals("Object,Object", OverloadedAdviceAspect.before6);
- assertEquals("FieldInfo", OverloadedAdviceAspect.before7);
- assertEquals("JoinPointInfo", OverloadedAdviceAspect.before8);
- assertEquals("Object", OverloadedAdviceAspect.before9);
- assertEquals("String", OverloadedAdviceAspect.before10);
- assertEquals("Object", OverloadedAdviceAspect.before11);
- assertEquals("", OverloadedAdviceAspect.before12);
- }
-}
\ No newline at end of file
Copied: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJO.java (from rev 58706, projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgPOJO.java)
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgPOJO.java 2006-11-28 17:24:44 UTC (rev 58706)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -0,0 +1,87 @@
+/*
+ * 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.args;
+
+
+/**
+ * Plain old java object used on the tests
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class POJO implements ArgPOJOInterface
+{
+ /* ArgTestCase */
+
+ public String echo(String echo)
+ {
+ return echo;
+ }
+
+ public int bunch(int x, double y, float z, String str, int q)
+ {
+ return x + (int) y + (int) z + q;
+ }
+
+ public int bunchArgs(int x, double y, float z, String str, int q)
+ {
+ return x + (int) y + (int) z + q;
+ }
+
+ public int bunchArgsWithInvocation(int x, double y, float z, String str, int q)
+ {
+ return x + (int) y + (int) z + q;
+ }
+
+ public int bunchWrapped(int x, double y, float z, String str, int q)
+ {
+ return x + (int) y + (int) z + q;
+ }
+
+ /* InvocationTestCase */
+
+ public int number;
+
+ public int callerMethod(int i)
+ {
+ return calleeMethod(i);
+ }
+
+ private int calleeMethod(int i)
+ {
+ return i*2;
+ }
+
+ public String method1()
+ {
+ return "method";
+ }
+
+ public int method2()
+ {
+ return 2;
+ }
+
+ /* OverloadedTestCase */
+
+ public void method3(int arg1, long arg2) {}
+}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJOException.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJOException.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/POJOException.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,34 +0,0 @@
-package org.jboss.test.aop.args;
-
-/**
- * Class used on annotated parameter tests.
- *
- * @author Flavia Rainone
- */
-public class POJOException extends Exception
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * A number that identifies the exception thrown.
- */
- int number;
-
- /**
- * Constructor.
- */
- public POJOException()
- {
- this(0);
- }
-
- /**
- * Constructor.
- *
- * @param number a number identifying the exception.
- */
- public POJOException(int number)
- {
- this.number = number;
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnAspect.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnAspect.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,185 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Assert;
-
-import org.jboss.aop.JoinPointInfo;
-import org.jboss.aop.advice.annotation.JoinPoint;
-import org.jboss.aop.advice.annotation.Return;
-import org.jboss.aop.joinpoint.Invocation;
-
-/**
- * Aspect used both on @Return parameter tests, and on advice return type tests.
- *
- * @author Flavia Rainone
- */
-public class ReturnAspect
-{
- public static String aroundAdvice = null;
- public static Object aroundReturn = null;
- public static String afterAdvice = null;
- public static Object afterReturn = null;
-
- public static void clear()
- {
- aroundAdvice = null;
- aroundReturn = null;
- afterAdvice = null;
- afterReturn = null;
- }
-
- public void before(@Return Object object)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing(@Return Object object)
- {
- 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 around2(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation) throws Exception
- {
- Assert.fail("This advice should never be executed");
- }
-
- public Object around3(Invocation invocation) throws Throwable
- {
- aroundAdvice = "around3";
- aroundReturn = invocation.invokeNext();
- return aroundAdvice;
- }
-
- public Object around4(@org.jboss.aop.advice.annotation.Invocation
- Invocation invocation) throws Throwable
- {
- aroundAdvice = "around4";
- aroundReturn = invocation.invokeNext();
- return aroundAdvice;
- }
-
- public Object around5()
- {
- aroundAdvice = "around5";
- return aroundAdvice;
- }
-
- public void around6()
- {
- Assert.fail("This advice should never be executed");
- }
-
- public String around7(@org.jboss.aop.advice.annotation.Invocation Invocation
- invocation) throws Throwable
- {
- aroundAdvice = "around7";
- aroundReturn = invocation.invokeNext();
- return aroundAdvice;
- }
-
- public SubValue around8()
- {
- aroundAdvice = "around8";
- return new SubValue(80);
- }
-
- public SuperValue around9(@org.jboss.aop.advice.annotation.Invocation Invocation
- invocation) throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public SubValue around10(@org.jboss.aop.advice.annotation.Invocation Invocation
- invocation) throws Throwable
- {
- aroundAdvice = "around10";
- aroundReturn = invocation.invokeNext();
- return new SubValue(100);
- }
-
- public SuperValue around11(@org.jboss.aop.advice.annotation.Invocation Invocation
- invocation) throws Throwable
- {
- aroundAdvice = "around11";
- aroundReturn = invocation.invokeNext();
- return new SuperValue(110);
- }
-
-
- public void after1(@org.jboss.aop.advice.annotation.JoinPoint JoinPointInfo info) throws Exception
- {
- afterAdvice = "after1";
- }
-
- public void after2(@Return Object returnedValue) throws Exception
- {
- afterAdvice = "after2";
- afterReturn = returnedValue;
- }
-
- public Object after3(@JoinPoint JoinPointInfo info, @Return String returnedValue)
- throws Throwable
- {
- afterAdvice = "after3";
- afterReturn = returnedValue;
- return afterAdvice;
- }
-
- public Object after4(@Return Object returnedValue) throws Throwable
- {
- afterAdvice = "after4";
- afterReturn = returnedValue;
- return afterAdvice;
- }
-
- public Object after5()
- {
- afterAdvice = "after5";
- return afterAdvice;
- }
-
- public void after6()
- {
- afterAdvice = "after6";
- }
-
- public String after7(@JoinPoint JoinPointInfo joinPoint,
- @Return String returnedValue) throws Throwable
- {
- afterAdvice = "after7";
- afterReturn = returnedValue;
- return afterAdvice;
- }
-
- public SubValue after8()
- {
- afterAdvice = "after8";
- return new SubValue(800);
- }
-
- public SuperValue after9() throws Throwable
- {
- Assert.fail("This advice should never be executed");
- return null;
- }
-
- public SubValue after10(@Return SubValue returnedValue) throws Throwable
- {
- afterAdvice = "after10";
- afterReturn = returnedValue;
- return new SubValue(1000);
- }
-
- public SubValue after11(@Return SuperValue returnedValue) throws Throwable
- {
- afterAdvice = "after11";
- afterReturn = returnedValue;
- return new SubValue(1100);
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnPOJO.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnPOJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,67 +0,0 @@
-package org.jboss.test.aop.args;
-
-/**
- * Plain old java object used both on @Return parameter tests, and on advice return type
- * tests.
- *
- * @author Flavia Rainone
- */
-public class ReturnPOJO
-{
- public void method1() {}
-
- public String method2()
- {
- return "method2";
- }
-
- public String method3()
- {
- return "method3";
- }
-
- public String method4()
- {
- return "method4";
- }
-
- public String method5()
- {
- return "method5";
- }
-
- public String method6()
- {
- return "method6";
- }
-
- public String method7()
- {
- return "method7";
- }
-
- public SubValue method8()
- {
- return new SubValue(8);
- }
-
- public SubValue method9()
- {
- return new SubValue(9);
- }
-
- public SuperValue method10()
- {
- return new SuperValue(10);
- }
-
- public SuperValue method11()
- {
- return new SuperValue(11);
- }
-
- public Object method12() throws POJOException
- {
- throw new POJOException();
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnTestCase.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ReturnTestCase.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,160 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.jboss.test.aop.AOPTestWithSetup;
-
-/**
- * Tests both the use of @Return parameters, and the use of return values in advices.
- *
- * @author Flavia Rainone
- */
-public class ReturnTestCase extends AOPTestWithSetup
-{
- private ReturnPOJO pojo;
-
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("ReturnTestCase");
- suite.addTestSuite(ReturnTestCase.class);
- return suite;
- }
-
- public ReturnTestCase(String name)
- {
- super(name);
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- ReturnAspect.clear();
- this.pojo = new ReturnPOJO();
- }
-
- public void test1()
- {
- pojo.method1();
- assertNull(ReturnAspect.aroundAdvice);
- assertNull(ReturnAspect.aroundReturn);
- assertEquals("after1", ReturnAspect.afterAdvice);
- assertNull(ReturnAspect.afterReturn);
- }
-
- public void test2()
- {
- assertEquals("method2", pojo.method2());
- assertNull(ReturnAspect.aroundAdvice);
- assertNull(ReturnAspect.aroundReturn);
- assertEquals("after2", ReturnAspect.afterAdvice);
- assertEquals("method2", ReturnAspect.afterReturn);
- }
-
- public void test3()
- {
- assertEquals("after3", pojo.method3());
- assertEquals("around3", ReturnAspect.aroundAdvice);
- assertEquals("method3", ReturnAspect.aroundReturn);
- assertEquals("after3", ReturnAspect.afterAdvice);
- assertEquals("around3", ReturnAspect.afterReturn);
- }
-
- public void test4()
- {
- assertEquals("after4", pojo.method4());
- assertEquals("around4", ReturnAspect.aroundAdvice);
- assertEquals("method4", ReturnAspect.aroundReturn);
- assertEquals("after4", ReturnAspect.afterAdvice);
- assertEquals("around4", ReturnAspect.afterReturn);
- }
-
- public void test5()
- {
- assertEquals("after5", pojo.method5());
- assertEquals("around5", ReturnAspect.aroundAdvice);
- assertNull(ReturnAspect.aroundReturn);
- assertEquals("after5", ReturnAspect.afterAdvice);
- assertNull(ReturnAspect.afterReturn);
- }
-
- public void test6()
- {
- assertEquals("method6", pojo.method6());
- assertNull(ReturnAspect.aroundAdvice);
- assertNull(ReturnAspect.aroundReturn);
- assertEquals("after6", ReturnAspect.afterAdvice);
- assertNull(ReturnAspect.afterReturn);
- }
-
- public void test7()
- {
- assertEquals("after7", pojo.method7());
- assertEquals("around7", ReturnAspect.aroundAdvice);
- assertEquals("method7", ReturnAspect.aroundReturn);
- assertEquals("after7", ReturnAspect.afterAdvice);
- assertEquals("around7", ReturnAspect.afterReturn);
- }
-
- public void test8()
- {
- SubValue value = pojo.method8();
- assertNotNull(value);
- assertEquals(800, value.i);
- assertEquals("around8", ReturnAspect.aroundAdvice);
- assertNull(ReturnAspect.aroundReturn);
- assertEquals("after8", ReturnAspect.afterAdvice);
- assertNull(ReturnAspect.afterReturn);
- }
-
- public void test9()
- {
- SubValue value = pojo.method9();
- assertNotNull(value);
- assertEquals(9, value.i);
- assertNull(ReturnAspect.aroundAdvice);
- assertNull(ReturnAspect.aroundReturn);
- assertNull(ReturnAspect.afterAdvice);
- assertNull(ReturnAspect.afterReturn);
- }
-
- public void test10()
- {
- SuperValue value = pojo.method10();
- assertNotNull(value);
- assertEquals(100, value.i);
- assertEquals("around10", ReturnAspect.aroundAdvice);
- assertNotNull(ReturnAspect.aroundReturn);
- assertEquals(10, ((SuperValue) ReturnAspect.aroundReturn).i);
- assertNull(ReturnAspect.afterAdvice);
- assertNull(ReturnAspect.afterReturn);
- }
-
- public void test11()
- {
- SuperValue value = pojo.method11();
- assertNotNull(value);
- assertEquals(1100, value.i);
- assertEquals("around11", ReturnAspect.aroundAdvice);
- assertNotNull(ReturnAspect.aroundReturn);
- assertEquals(11, ((SuperValue) ReturnAspect.aroundReturn).i);
- assertEquals("after11", ReturnAspect.afterAdvice);
- assertNotNull(ReturnAspect.afterReturn);
- assertEquals(110, ((SuperValue) ReturnAspect.afterReturn).i);
- }
-
- public void test12()
- {
- try
- {
- pojo.method12();
- }
- catch(POJOException e){}
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SubValue.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SubValue.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SubValue.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,38 +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.args;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 39449 $
- */
-public class SubValue extends SuperValue
-{
-
- public SubValue(int i)
- {
- // FIXME SubValue constructor
- super(i);
- }
-
-}
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SuperValue.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SuperValue.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/SuperValue.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,47 +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.args;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 39449 $
- */
-public class SuperValue
-{
- int i;
- public SuperValue(int i)
- {
- this.i = i;
- }
-
- public int getValue()
- {
- return i;
- }
-
- public void doubleValue()
- {
- i *= 2;
- }
-
-}
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownAspect.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownAspect.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,67 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Assert;
-
-import org.jboss.aop.advice.annotation.Arg;
-import org.jboss.aop.advice.annotation.Thrown;
-
-/**
- * Aspect used on @Thrown parameter tests.
- *
- * @author Flavia Rainone
- */
-public class ThrownAspect
-{
-
- public static String advice;
- public static Throwable thrown;
- public static int thrownNumber;
-
- public static void clear()
- {
- advice = null;
- thrown = null;
- thrownNumber = 0;
- }
-
- public void throwing1()
- {
- advice = "throwing1";
- }
-
- public void throwing2(@Thrown Throwable throwable, @Arg int i)
- {
- advice = "throwing2";
- thrownNumber = i;
- thrown = throwable;
- }
-
- public void throwing3(@Thrown Exception exception)
- {
- advice = "throwing3";
- thrownNumber = ((POJOException) exception).number;
- thrown = exception;
- }
-
- public void throwing4(@Thrown POJOException pojoException, @Arg int i)
- {
- advice = "throwing4";
- thrownNumber = i;
- thrown = pojoException;
- }
-
- public void throwing5(@Thrown RuntimeException runtimeException)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing6(Throwable throwable)
- {
- Assert.fail("This advice should never be executed");
- }
-
- public void throwing7(@Arg int i)
- {
- Assert.fail("This advice should never be executed");
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownPOJO.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownPOJO.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,39 +0,0 @@
-package org.jboss.test.aop.args;
-
-/**
- * Plain old java object used on @Thrown parameter tests.
- *
- * @author Flavia Rainone
- */
-public class ThrownPOJO
-{
- public void method1(int i) throws POJOException
- {
- throw new POJOException(i);
- }
-
- public void method2(int i) throws POJOException
- {
- throw new POJOException(i);
- }
-
- public void method3(int i) throws POJOException
- {
- throw new POJOException(i);
- }
-
- public void method4(int i) throws POJOException
- {
- throw new POJOException(i);
- }
-
- public void method5(int i) throws POJOException
- {
- throw new POJOException(i);
- }
-
- public void method6() throws POJOException
- {
- throw new POJOException(6);
- }
-}
\ No newline at end of file
Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownTestCase.java 2006-12-02 03:46:16 UTC (rev 58816)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ThrownTestCase.java 2006-12-02 04:09:03 UTC (rev 58817)
@@ -1,156 +0,0 @@
-package org.jboss.test.aop.args;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.jboss.test.aop.AOPTestWithSetup;
-
-/**
- * Tests parameter annotation @Thrown.
- *
- * @author Flavia Rainone
- *
- */
-public class ThrownTestCase extends AOPTestWithSetup
-{
- private ThrownPOJO pojo;
-
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("ThrownTestCase");
- suite.addTestSuite(ThrownTestCase.class);
- return suite;
- }
-
- public ThrownTestCase(String name)
- {
- super(name);
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- ThrownAspect.clear();
- this.pojo = new ThrownPOJO();
- }
-
- public void test1()
- {
- boolean thrown = false;
- try
- {
- pojo.method1(11);
- }
- catch(POJOException pojoException)
- {
- thrown = true;
- assertEquals(11, pojoException.number);
- assertNull(ThrownAspect.advice);
- assertNull(ThrownAspect.thrown);
- assertEquals(0, ThrownAspect.thrownNumber);
- }
- assertTrue(thrown);
- }
-
- public void test2()
- {
- boolean thrown = false;
- try
- {
- pojo.method2(23);
- }
- catch(POJOException pojoException)
- {
- thrown = true;
- assertEquals(23, pojoException.number);
- assertEquals("throwing2", ThrownAspect.advice);
- assertEquals(pojoException, ThrownAspect.thrown);
- assertEquals(23, ThrownAspect.thrownNumber);
- }
- assertTrue(thrown);
- }
-
- public void test3()
- {
- boolean thrown = false;
- try
- {
- pojo.method3(37);
- }
- catch(POJOException pojoException)
- {
- thrown = true;
- assertEquals(37, pojoException.number);
- assertNull(ThrownAspect.advice);
- assertNull(ThrownAspect.thrown);
- assertEquals(0, ThrownAspect.thrownNumber);
- /*assertEquals("throwing3", ThrownAspect.advice);
- assertEquals(pojoException, ThrownAspect.thrown);
- assertEquals(37, ThrownAspect.thrownNumber);*/
- }
- assertTrue(thrown);
- }
-
- public void test4()
- {
- boolean thrown = false;
- try
- {
- pojo.method4(43);
- }
- catch(POJOException pojoException)
- {
- thrown = true;
- assertEquals(43, pojoException.number);
- assertNull(ThrownAspect.advice);
- assertNull(ThrownAspect.thrown);
- assertEquals(0, ThrownAspect.thrownNumber);
- /*assertEquals("throwing4", ThrownAspect.advice);
- assertEquals(pojoException, ThrownAspect.thrown);
- assertEquals(43, ThrownAspect.thrownNumber);*/
- }
- assertTrue(thrown);
- }
-
- public void test5()
- {
- boolean thrown = false;
- try
- {
- pojo.method5(59);
- }
- catch(POJOException pojoException)
- {
- thrown = true;
- assertEquals(59, pojoException.number);
- assertNull(ThrownAspect.advice);
- assertNull(ThrownAspect.thrown);
- assertEquals(0, ThrownAspect.thrownNumber);
- }
- assertTrue(thrown);
- }
-
- public void test6()
- {
- boolean thrown = false;
- try
- {
- pojo.method6();
- }
- catch(POJOException pojoException)
- {
- thrown = true;
- assertEquals(6, pojoException.number);
- assertNull(ThrownAspect.advice);
- assertNull(ThrownAspect.thrown);
- assertEquals(0, ThrownAspect.thrownNumber);
- }
- assertTrue(thrown);
- }
-}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list