[jboss-cvs] JBossAS SVN: r66043 - in projects/aop/trunk/aop/src: test/org/jboss/test/aop/annotatedAdviceParams and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 11 15:37:36 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-10-11 15:37:36 -0400 (Thu, 11 Oct 2007)
New Revision: 66043
Modified:
projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java
Log:
[JBAOP-472] Added @Arg tests with method call joinpoints.
Modified: projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml 2007-10-11 19:08:32 UTC (rev 66042)
+++ projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml 2007-10-11 19:37:36 UTC (rev 66043)
@@ -357,7 +357,8 @@
<aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics" scope="PER_VM"/>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*Execution*(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*Call*(java.util.List))
OR execution(org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->new(java.util.List,..))
OR construction(org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->new(.., java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*)">
@@ -383,7 +384,8 @@
<finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*Execution*(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*Call*(java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*)">
<around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
<around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
@@ -401,21 +403,24 @@
<around name="around6_Cons" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before7(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*ExecutionBefore7(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*CallBefore7(java.util.List))
OR execution(org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->new(java.util.List, boolean))
OR construction(org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->new(boolean, java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before7)">
<before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before8(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*ExecutionBefore8(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*CallBefore8(java.util.List))
OR execution(org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->new(java.util.List, char))
OR construction(org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->new(char, java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before8)">
<before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around5(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*ExecutionAround5(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*CallAround5(java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around5)">
<around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
@@ -425,7 +430,8 @@
<around name="around5_" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around7(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*ExecutionAround7(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*CallAround7(java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around7)">
<around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
@@ -435,7 +441,8 @@
<around name="around7_" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
- <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around8(java.util.List))
+ <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*ExecutionAround8(java.util.List))
+ OR call(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*CallAround8(java.util.List))
OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around8)">
<around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
</bind>
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java 2007-10-11 19:08:32 UTC (rev 66042)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java 2007-10-11 19:37:36 UTC (rev 66043)
@@ -68,13 +68,13 @@
ArgAspectGenerics.clear();
}
- public void testGenerics1()
+ public void testGenericsExecution()
{
List<SuperValue> list = new ArrayList<SuperValue>();
boolean thrown = false;
try
{
- pojo.method13Before7(list);
+ pojo.methodGenericsExecutionBefore7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -85,7 +85,7 @@
thrown = false;
try
{
- pojo.method13Before8(list);
+ pojo.methodGenericsExecutionBefore8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -96,7 +96,7 @@
thrown = false;
try
{
- pojo.method13Around5(list);
+ pojo.methodGenericsExecutionAround5(list);
}
catch(NoMatchingAdviceException e)
{
@@ -107,7 +107,7 @@
thrown = false;
try
{
- pojo.method13Around7(list);
+ pojo.methodGenericsExecutionAround7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -118,7 +118,7 @@
thrown = false;
try
{
- pojo.method13Around8(list);
+ pojo.methodGenericsExecutionAround8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -129,7 +129,7 @@
thrown = false;
try
{
- pojo.method13After5(list);
+ pojo.methodGenericsExecutionAfter5(list);
}
catch(NoMatchingAdviceException e)
{
@@ -140,7 +140,7 @@
thrown = false;
try
{
- pojo.method13After7(list);
+ pojo.methodGenericsExecutionAfter7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -151,7 +151,7 @@
thrown = false;
try
{
- pojo.method13After8(list);
+ pojo.methodGenericsExecutionAfter8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -162,7 +162,7 @@
thrown = false;
try
{
- pojo.method13Throwing2(list);
+ pojo.methodGenericsExecutionThrowing2(list);
}
catch(NoMatchingAdviceException e)
{
@@ -173,7 +173,7 @@
thrown = false;
try
{
- pojo.method13Throwing7(list);
+ pojo.methodGenericsExecutionThrowing7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -184,7 +184,7 @@
thrown = false;
try
{
- pojo.method13Throwing8(list);
+ pojo.methodGenericsExecutionThrowing8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -195,7 +195,7 @@
thrown = false;
try
{
- pojo.method13Finally5(list);
+ pojo.methodGenericsExecutionFinally5(list);
}
catch(NoMatchingAdviceException e)
{
@@ -206,7 +206,7 @@
thrown = false;
try
{
- pojo.method13Finally7(list);
+ pojo.methodGenericsExecutionFinally7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -217,7 +217,7 @@
thrown = false;
try
{
- pojo.method13Finally8(list);
+ pojo.methodGenericsExecutionFinally8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -226,13 +226,13 @@
assertTrue(thrown);
}
- public void testGenerics2() throws POJOException
+ public void testGenericsFieldWrite()
{
List<SuperValue> list = new ArrayList<SuperValue>();
boolean thrown = false;
try
{
- pojo.method14Before7(list);
+ pojo.field5Before7 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -243,7 +243,7 @@
thrown = false;
try
{
- pojo.method14Before8(list);
+ pojo.field5Before8 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -254,7 +254,7 @@
thrown = false;
try
{
- pojo.method14Around5(list);
+ pojo.field5Around5 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -265,7 +265,7 @@
thrown = false;
try
{
- pojo.method14Around7(list);
+ pojo.field5Around7 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -276,7 +276,7 @@
thrown = false;
try
{
- pojo.method14Around8(list);
+ pojo.field5Around8 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -287,7 +287,7 @@
thrown = false;
try
{
- pojo.method14After5(list);
+ pojo.field5After5 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -298,7 +298,7 @@
thrown = false;
try
{
- pojo.method14After7(list);
+ pojo.field5After7 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -309,7 +309,7 @@
thrown = false;
try
{
- pojo.method14After8(list);
+ pojo.field5After8 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -320,7 +320,7 @@
thrown = false;
try
{
- pojo.method14Throwing2(list);
+ pojo.field5Throwing2 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -331,7 +331,7 @@
thrown = false;
try
{
- pojo.method14Throwing7(list);
+ pojo.field5Throwing7 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -342,7 +342,7 @@
thrown = false;
try
{
- pojo.method14Throwing8(list);
+ pojo.field5Throwing8 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -353,7 +353,7 @@
thrown = false;
try
{
- pojo.method14Finally5(list);
+ pojo.field5Finally5 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -364,7 +364,7 @@
thrown = false;
try
{
- pojo.method14Finally7(list);
+ pojo.field5Finally7 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -375,7 +375,7 @@
thrown = false;
try
{
- pojo.method14Finally8(list);
+ pojo.field5Finally8 = list;
}
catch(NoMatchingAdviceException e)
{
@@ -384,13 +384,14 @@
assertTrue(thrown);
}
- public void testGenerics3()
+ public void testGenericsConstructorExecution()
{
List<SuperValue> list = new ArrayList<SuperValue>();
boolean thrown = false;
try
{
- pojo.field5Before7 = list;
+ // test before7
+ new ArgsInvalidPOJO(list, false);
}
catch(NoMatchingAdviceException e)
{
@@ -401,7 +402,8 @@
thrown = false;
try
{
- pojo.field5Before8 = list;
+ // test before8
+ new ArgsInvalidPOJO(list, '\0');
}
catch(NoMatchingAdviceException e)
{
@@ -412,7 +414,8 @@
thrown = false;
try
{
- pojo.field5Around5 = list;
+ // test around5_
+ new ArgsInvalidPOJO(list, (byte)0);
}
catch(NoMatchingAdviceException e)
{
@@ -423,7 +426,8 @@
thrown = false;
try
{
- pojo.field5Around7 = list;
+ // test around7_
+ new ArgsInvalidPOJO(list, (short)0);
}
catch(NoMatchingAdviceException e)
{
@@ -434,7 +438,8 @@
thrown = false;
try
{
- pojo.field5Around8 = list;
+ // test around8_
+ new ArgsInvalidPOJO(list, 0);
}
catch(NoMatchingAdviceException e)
{
@@ -445,7 +450,8 @@
thrown = false;
try
{
- pojo.field5After5 = list;
+ // test after5
+ new ArgsInvalidPOJO(list, 0l);
}
catch(NoMatchingAdviceException e)
{
@@ -456,7 +462,8 @@
thrown = false;
try
{
- pojo.field5After7 = list;
+ // test after7
+ new ArgsInvalidPOJO(list, (float) 0.0);
}
catch(NoMatchingAdviceException e)
{
@@ -467,7 +474,8 @@
thrown = false;
try
{
- pojo.field5After8 = list;
+ // test after8
+ new ArgsInvalidPOJO(list, 0.0);
}
catch(NoMatchingAdviceException e)
{
@@ -478,7 +486,8 @@
thrown = false;
try
{
- pojo.field5Throwing2 = list;
+ // test throwing2
+ new ArgsInvalidPOJO(list, false, false);
}
catch(NoMatchingAdviceException e)
{
@@ -489,7 +498,8 @@
thrown = false;
try
{
- pojo.field5Throwing7 = list;
+ // test throwing7
+ new ArgsInvalidPOJO(list, false, '\0');
}
catch(NoMatchingAdviceException e)
{
@@ -500,7 +510,8 @@
thrown = false;
try
{
- pojo.field5Throwing8 = list;
+ // test throwing8
+ new ArgsInvalidPOJO(list, false, (byte) 0);
}
catch(NoMatchingAdviceException e)
{
@@ -511,7 +522,8 @@
thrown = false;
try
{
- pojo.field5Finally5 = list;
+ // test finally5
+ new ArgsInvalidPOJO(list, false, (short) 0);
}
catch(NoMatchingAdviceException e)
{
@@ -522,7 +534,8 @@
thrown = false;
try
{
- pojo.field5Finally7 = list;
+ // test finally7
+ new ArgsInvalidPOJO(list, false, 0);
}
catch(NoMatchingAdviceException e)
{
@@ -533,7 +546,8 @@
thrown = false;
try
{
- pojo.field5Finally8 = list;
+ // test finally8
+ new ArgsInvalidPOJO(list, false, 0l);
}
catch(NoMatchingAdviceException e)
{
@@ -542,14 +556,14 @@
assertTrue(thrown);
}
- public void testGenerics4()
+ public void testGenericsConstruction()
{
List<SuperValue> list = new ArrayList<SuperValue>();
boolean thrown = false;
try
{
// test before7
- new ArgsInvalidPOJO(list, false);
+ new ArgsInvalidPOJO(false, list);
}
catch(NoMatchingAdviceException e)
{
@@ -561,7 +575,7 @@
try
{
// test before8
- new ArgsInvalidPOJO(list, '\0');
+ new ArgsInvalidPOJO('\0', list);
}
catch(NoMatchingAdviceException e)
{
@@ -573,7 +587,7 @@
try
{
// test around5_
- new ArgsInvalidPOJO(list, (byte)0);
+ new ArgsInvalidPOJO((byte)0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -585,7 +599,7 @@
try
{
// test around7_
- new ArgsInvalidPOJO(list, (short)0);
+ new ArgsInvalidPOJO((short)0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -597,7 +611,7 @@
try
{
// test around8_
- new ArgsInvalidPOJO(list, 0);
+ new ArgsInvalidPOJO(0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -609,7 +623,7 @@
try
{
// test after5
- new ArgsInvalidPOJO(list, 0l);
+ new ArgsInvalidPOJO(0l, list);
}
catch(NoMatchingAdviceException e)
{
@@ -621,7 +635,7 @@
try
{
// test after7
- new ArgsInvalidPOJO(list, (float) 0.0);
+ new ArgsInvalidPOJO((float) 0.0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -633,7 +647,7 @@
try
{
// test after8
- new ArgsInvalidPOJO(list, 0.0);
+ new ArgsInvalidPOJO(0.0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -645,7 +659,7 @@
try
{
// test throwing2
- new ArgsInvalidPOJO(list, false, false);
+ new ArgsInvalidPOJO(false, false, list);
}
catch(NoMatchingAdviceException e)
{
@@ -657,7 +671,7 @@
try
{
// test throwing7
- new ArgsInvalidPOJO(list, false, '\0');
+ new ArgsInvalidPOJO(false, '\0', list);
}
catch(NoMatchingAdviceException e)
{
@@ -669,7 +683,7 @@
try
{
// test throwing8
- new ArgsInvalidPOJO(list, false, (byte) 0);
+ new ArgsInvalidPOJO(false, (byte) 0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -681,7 +695,7 @@
try
{
// test finally5
- new ArgsInvalidPOJO(list, false, (short) 0);
+ new ArgsInvalidPOJO(false, (short) 0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -693,7 +707,7 @@
try
{
// test finally7
- new ArgsInvalidPOJO(list, false, 0);
+ new ArgsInvalidPOJO(false, 0, list);
}
catch(NoMatchingAdviceException e)
{
@@ -705,7 +719,7 @@
try
{
// test finally8
- new ArgsInvalidPOJO(list, false, 0l);
+ new ArgsInvalidPOJO(false, 0l, list);
}
catch(NoMatchingAdviceException e)
{
@@ -714,14 +728,13 @@
assertTrue(thrown);
}
- public void testGenerics5()
+ public void testGenericsCall()
{
List<SuperValue> list = new ArrayList<SuperValue>();
boolean thrown = false;
try
{
- // test before7
- new ArgsInvalidPOJO(false, list);
+ pojo.methodGenericsCallBefore7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -732,8 +745,7 @@
thrown = false;
try
{
- // test before8
- new ArgsInvalidPOJO('\0', list);
+ pojo.methodGenericsCallBefore8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -744,8 +756,7 @@
thrown = false;
try
{
- // test around5_
- new ArgsInvalidPOJO((byte)0, list);
+ pojo.methodGenericsCallAround5(list);
}
catch(NoMatchingAdviceException e)
{
@@ -756,8 +767,7 @@
thrown = false;
try
{
- // test around7_
- new ArgsInvalidPOJO((short)0, list);
+ pojo.methodGenericsCallAround7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -768,8 +778,7 @@
thrown = false;
try
{
- // test around8_
- new ArgsInvalidPOJO(0, list);
+ pojo.methodGenericsCallAround8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -780,8 +789,7 @@
thrown = false;
try
{
- // test after5
- new ArgsInvalidPOJO(0l, list);
+ pojo.methodGenericsCallAfter5(list);
}
catch(NoMatchingAdviceException e)
{
@@ -792,8 +800,7 @@
thrown = false;
try
{
- // test after7
- new ArgsInvalidPOJO((float) 0.0, list);
+ pojo.methodGenericsCallAfter7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -804,8 +811,7 @@
thrown = false;
try
{
- // test after8
- new ArgsInvalidPOJO(0.0, list);
+ pojo.methodGenericsCallAfter8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -816,8 +822,7 @@
thrown = false;
try
{
- // test throwing2
- new ArgsInvalidPOJO(false, false, list);
+ pojo.methodGenericsCallThrowing2(list);
}
catch(NoMatchingAdviceException e)
{
@@ -828,8 +833,7 @@
thrown = false;
try
{
- // test throwing7
- new ArgsInvalidPOJO(false, '\0', list);
+ pojo.methodGenericsCallThrowing7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -840,8 +844,7 @@
thrown = false;
try
{
- // test throwing8
- new ArgsInvalidPOJO(false, (byte) 0, list);
+ pojo.methodGenericsCallThrowing8(list);
}
catch(NoMatchingAdviceException e)
{
@@ -852,8 +855,7 @@
thrown = false;
try
{
- // test finally5
- new ArgsInvalidPOJO(false, (short) 0, list);
+ pojo.methodGenericsCallFinally5(list);
}
catch(NoMatchingAdviceException e)
{
@@ -864,8 +866,7 @@
thrown = false;
try
{
- // test finally7
- new ArgsInvalidPOJO(false, 0, list);
+ pojo.methodGenericsCallFinally7(list);
}
catch(NoMatchingAdviceException e)
{
@@ -876,8 +877,7 @@
thrown = false;
try
{
- // test finally8
- new ArgsInvalidPOJO(false, 0l, list);
+ pojo.methodGenericsCallFinally8(list);
}
catch(NoMatchingAdviceException e)
{
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java 2007-10-11 19:08:32 UTC (rev 66042)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java 2007-10-11 19:37:36 UTC (rev 66043)
@@ -417,7 +417,7 @@
public void testGenericsOnMethod()
{
List<SuperValue> list = new ArrayList<SuperValue>();
- pojo.method13(list);
+ pojo.methodGenericsExecution1(list);
assertGenericsAdvices(false);
}
@@ -427,7 +427,7 @@
try
{
List<SuperValue> list = new ArrayList<SuperValue>();
- pojo.method14(list);
+ pojo.methodGenericsExecution2(list);
}
catch(POJOException e)
{
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java 2007-10-11 19:08:32 UTC (rev 66042)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java 2007-10-11 19:37:36 UTC (rev 66043)
@@ -502,105 +502,63 @@
throw new POJOException();
}
- /* method13(List<SuperValue>) */
+ /* methodGenericsExecution1(List<SuperValue>) */
- public void method13Before7(List<SuperValue> arg) {}
+ public void methodGenericsExecutionBefore7(List<SuperValue> arg) {}
- public void method13Before8(List<SuperValue> arg) {}
+ public void methodGenericsExecutionBefore8(List<SuperValue> arg) {}
- public void method13Around5(List<SuperValue> arg) {}
+ public void methodGenericsExecutionAround5(List<SuperValue> arg) {}
- public void method13Around7(List<SuperValue> arg) {}
+ public void methodGenericsExecutionAround7(List<SuperValue> arg) {}
- public void method13Around8(List<SuperValue> arg) {}
+ public void methodGenericsExecutionAround8(List<SuperValue> arg) {}
- public void method13After5(List<SuperValue> arg) {}
+ public void methodGenericsExecutionAfter5(List<SuperValue> arg) {}
- public void method13After7(List<SuperValue> arg) {}
+ public void methodGenericsExecutionAfter7(List<SuperValue> arg) {}
- public void method13After8(List<SuperValue> arg) {}
+ public void methodGenericsExecutionAfter8(List<SuperValue> arg) {}
- public void method13Throwing2(List<SuperValue> arg) {}
+ public void methodGenericsExecutionThrowing2(List<SuperValue> arg) {}
- public void method13Throwing7(List<SuperValue> arg) {}
+ public void methodGenericsExecutionThrowing7(List<SuperValue> arg) {}
- public void method13Throwing8(List<SuperValue> arg) {}
+ public void methodGenericsExecutionThrowing8(List<SuperValue> arg) {}
- public void method13Finally5(List<SuperValue> arg) {}
+ public void methodGenericsExecutionFinally5(List<SuperValue> arg) {}
- public void method13Finally7(List<SuperValue> arg) {}
+ public void methodGenericsExecutionFinally7(List<SuperValue> arg) {}
- public void method13Finally8(List<SuperValue> arg) {}
+ public void methodGenericsExecutionFinally8(List<SuperValue> arg) {}
- /* method14(List<SuperValue>) */
+ /* methodGenericsCall1(List<SuperValue>) */
- public void method14Before7(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallBefore7(List<SuperValue> arg) {}
- public void method14Before8(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallBefore8(List<SuperValue> arg) {}
- public void method14Around5(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallAround5(List<SuperValue> arg) {}
- public void method14Around7(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallAround7(List<SuperValue> arg) {}
- public void method14Around8(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallAround8(List<SuperValue> arg) {}
- public void method14After5(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallAfter5(List<SuperValue> arg) {}
- public void method14After7(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallAfter7(List<SuperValue> arg) {}
- public void method14After8(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallAfter8(List<SuperValue> arg) {}
- public void method14Throwing2(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallThrowing2(List<SuperValue> arg) {}
- public void method14Throwing7(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallThrowing7(List<SuperValue> arg) {}
- public void method14Throwing8(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallThrowing8(List<SuperValue> arg) {}
- public void method14Finally5(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallFinally5(List<SuperValue> arg) {}
- public void method14Finally7(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallFinally7(List<SuperValue> arg) {}
- public void method14Finally8(List<SuperValue> arg) throws POJOException
- {
- throw new POJOException();
- }
+ public void methodGenericsCallFinally8(List<SuperValue> arg) {}
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java 2007-10-11 19:08:32 UTC (rev 66042)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java 2007-10-11 19:37:36 UTC (rev 66043)
@@ -151,10 +151,18 @@
}
// test of generics
- public void method13(List<SuperValue> arg) {}
+ public void methodGenericsExecution1(List<SuperValue> arg) {}
- public void method14(List<SuperValue> arg) throws POJOException
+ public void methodGenericsExecution2(List<SuperValue> arg) throws POJOException
{
throw new POJOException();
}
+
+ // test of generics
+ public void methodGenericsCall1(List<SuperValue> arg) {}
+
+ public void methodGenericsCall2(List<SuperValue> arg) throws POJOException
+ {
+ throw new POJOException();
+ }
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list