[jboss-cvs] JBossAS SVN: r66041 - 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 14:37:40 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-10-11 14:37:40 -0400 (Thu, 11 Oct 2007)
New Revision: 66041
Modified:
projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidJDK50TestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnJDK50TestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java
Log:
[JBAOP-472] Added field read tests.
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 18:13:30 UTC (rev 66040)
+++ projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml 2007-10-11 18:37:40 UTC (rev 66041)
@@ -1009,7 +1009,8 @@
<after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method2Around2(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method2Around2(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field1Around2)">
<around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1020,7 +1021,8 @@
<finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method3Before(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method3Before(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field2Before)">
<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1037,7 +1039,8 @@
<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method5Finally5(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method5Finally5(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field4Finally5)">
<finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1047,7 +1050,8 @@
<finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method6Around6(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method6Around6(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field5Around6)">
<around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1065,19 +1069,23 @@
<finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method8Before(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method8Before(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field7Before)">
<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9Around9(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9Around9(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field8Around9)">
<around name="around9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9After9(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9After9(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field8After9)">
<after name="after9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9Finally9(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9Finally9(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field8Finally9)">
<finally name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1087,11 +1095,13 @@
<finally name="finally10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method10Before(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method10Before(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field9Before)">
<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method10After10(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method10After10(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->field9After10)">
<after name="after10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1116,7 +1126,8 @@
<aspect class="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics" scope="PER_VM"/>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->*(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->*(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->*)">
<around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
<around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
@@ -1134,63 +1145,78 @@
<finally name="finally11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around1(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around1(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around1)">
<around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around2(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around2(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around2)">
<around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around4(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around4(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around4)">
<around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around5(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around5(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around5)">
<around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around6(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around6(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around6)">
<around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around7(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around7(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around7)">
<around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around8(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around8(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Around8)">
<around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After5(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After5(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After5)">
<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After7(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After7(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After7)">
<after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After8(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After8(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*After8)">
<after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally5(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally5(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally5)">
<after name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally7(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally7(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally7)">
<after name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally8(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally8(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally8)">
<after name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally9(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally9(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally9)">
<after name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
- <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally10(..))">
+ <bind pointcut="execution(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally10(..))
+ OR get(java.util.List org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->*Finally10)">
<after name="finally10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspectGenerics"/>
</bind>
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidJDK50TestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidJDK50TestCase.java 2007-10-11 18:13:30 UTC (rev 66040)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidJDK50TestCase.java 2007-10-11 18:37:40 UTC (rev 66041)
@@ -62,7 +62,7 @@
this.pojo = new ReturnInvalidPOJO();
}
- public void testGenerics()
+ public void testGenerics1()
{
boolean thrown = false;
try
@@ -218,4 +218,161 @@
}
assertTrue(thrown);
}
+
+ public void testGenerics2()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAround1);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAround2);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAround4);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAround5);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAround7);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAround8);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAfter5);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAfter7);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsAfter8);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsFinally5);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsFinally7);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsFinally8);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsFinally9);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.fieldGenericsFinally10);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java 2007-10-11 18:13:30 UTC (rev 66040)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java 2007-10-11 18:37:40 UTC (rev 66041)
@@ -38,6 +38,54 @@
*/
public class ReturnInvalidPOJO
{
+ /* String field1 */
+
+ public String field1Around2;
+
+ /* String field2 */
+
+ public String field2Before;
+
+ /* String field4 */
+
+ public String field4Finally5;
+
+ /* String field5 */
+
+ public String field5Around6;
+
+ /* SubValue field7 */
+
+ public SubValue field7Before;
+
+ /* SubValue field8 */
+
+ public SubValue field8Around9;
+ public SubValue field8After9;
+ public SubValue field8Finally9;
+
+ /* SuperValue field9 */
+
+ public SuperValue field9Before;
+ public SuperValue field9After10;
+
+ /* List<SuperValue> fieldGenerics */
+
+ public List<SuperValue> fieldGenericsAround1;
+ public List<SuperValue> fieldGenericsAround2;
+ public List<SuperValue> fieldGenericsAround4;
+ public List<SuperValue> fieldGenericsAround5;
+ public List<SuperValue> fieldGenericsAround7;
+ public List<SuperValue> fieldGenericsAround8;
+ public List<SuperValue> fieldGenericsAfter5;
+ public List<SuperValue> fieldGenericsAfter7;
+ public List<SuperValue> fieldGenericsAfter8;
+ public List<SuperValue> fieldGenericsFinally5;
+ public List<SuperValue> fieldGenericsFinally7;
+ public List<SuperValue> fieldGenericsFinally8;
+ public List<SuperValue> fieldGenericsFinally9;
+ public List<SuperValue> fieldGenericsFinally10;
+
/* method1() */
public void method1Before() {}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java 2007-10-11 18:13:30 UTC (rev 66040)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java 2007-10-11 18:37:40 UTC (rev 66041)
@@ -40,6 +40,7 @@
public static void main(String[] args)
{
+
TestRunner.run(suite());
}
@@ -206,4 +207,135 @@
}
assertTrue(thrown);
}
+
+ public void test11()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field1Around2);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void test12()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field2Before);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void test13()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field4Finally5);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void test14()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field5Around6);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void test15()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field7Before);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void test16()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field8Around9);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.field8After9);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.field8Finally9);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void test17()
+ {
+ boolean thrown = false;
+ try
+ {
+ assertNull(pojo.field9Before);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ assertNull(pojo.field9After10);
+ }
+ catch (NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnJDK50TestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnJDK50TestCase.java 2007-10-11 18:13:30 UTC (rev 66040)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnJDK50TestCase.java 2007-10-11 18:37:40 UTC (rev 66041)
@@ -109,4 +109,24 @@
assertTrue(ReturnAspectGenerics.finally6);
assertTrue(ReturnAspectGenerics.finally11);
}
+
+ public void testGenerics3() throws Exception
+ {
+ assertNull(pojo.fieldGenerics);
+
+ assertTrue(ReturnAspectGenerics.around3);
+ assertTrue(ReturnAspectGenerics.after1);
+ assertTrue(ReturnAspectGenerics.after2);
+ assertTrue(ReturnAspectGenerics.after3);
+ assertTrue(ReturnAspectGenerics.after4);
+ assertTrue(ReturnAspectGenerics.after6);
+ assertTrue(ReturnAspectGenerics.after9);
+ assertTrue(ReturnAspectGenerics.after10);
+ assertTrue(ReturnAspectGenerics.finally1);
+ assertTrue(ReturnAspectGenerics.finally2);
+ assertTrue(ReturnAspectGenerics.finally3);
+ assertTrue(ReturnAspectGenerics.finally4);
+ assertTrue(ReturnAspectGenerics.finally6);
+ assertTrue(ReturnAspectGenerics.finally11);
+ }
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java 2007-10-11 18:13:30 UTC (rev 66040)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java 2007-10-11 18:37:40 UTC (rev 66041)
@@ -42,6 +42,8 @@
public SuperValue field9 = new SuperValue(9);
public SuperValue field10 = new SuperValue(10);
+ public List<SuperValue> fieldGenerics;
+
public void method1() {}
public String method2()
More information about the jboss-cvs-commits
mailing list