[jboss-cvs] JBossAS SVN: r66039 - 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 13:35:58 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-10-11 13:35:58 -0400 (Thu, 11 Oct 2007)
New Revision: 66039
Modified:
projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java
Log:
[JBAOP-322] Added field read tests (they were missing)
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 17:28:44 UTC (rev 66038)
+++ projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml 2007-10-11 17:35:58 UTC (rev 66039)
@@ -1004,7 +1004,8 @@
<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method2(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method2(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field1)">
<after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1012,7 +1013,8 @@
<around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method3(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method3(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field2)">
<around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
@@ -1022,13 +1024,15 @@
<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method4(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method4(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field3)">
<around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method5(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method5(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field4)">
<around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1037,7 +1041,8 @@
<finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method6(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method6(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field5)">
<after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1046,13 +1051,15 @@
<around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method7(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method7(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field6)">
<around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method8(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method8(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field7)">
<around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
@@ -1074,7 +1081,8 @@
<finally name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method10(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method10(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field9)">
<around name="around10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
@@ -1087,7 +1095,8 @@
<after name="after10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
</bind>
- <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method11(..))">
+ <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method11(..))
+ OR get(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->field10)">
<around name="around11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<after name="after11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
<finally name="finally11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java 2007-10-11 17:28:44 UTC (rev 66038)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java 2007-10-11 17:35:58 UTC (rev 66039)
@@ -52,6 +52,7 @@
afterReturn = null;
finallyAdvice = null;
finallyReturn = null;
+ finallyThrown = null;
}
public void before(@Return Object object)
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 17:28:44 UTC (rev 66038)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java 2007-10-11 17:35:58 UTC (rev 66039)
@@ -31,6 +31,17 @@
*/
public class ReturnPOJO
{
+ public String field1 = "field1";
+ public String field2 = "field2";
+ public String field3 = "field3";
+ public String field4 = "field4";
+ public String field5 = "field5";
+ public String field6 = "field6";
+
+ public SubValue field7 = new SubValue(7);
+ public SuperValue field9 = new SuperValue(9);
+ public SuperValue field10 = new SuperValue(10);
+
public void method1() {}
public String method2()
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java 2007-10-11 17:28:44 UTC (rev 66038)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java 2007-10-11 17:35:58 UTC (rev 66039)
@@ -245,4 +245,133 @@
assertNull(ReturnAspect.finallyReturn);
assertSame(thrown, ReturnAspect.finallyThrown);
}
+
+ public void test14()
+ {
+ assertEquals("field1", pojo.field1);
+
+ assertNull(ReturnAspect.aroundAdvice);
+ assertNull(ReturnAspect.aroundReturn);
+ assertEquals("after2", ReturnAspect.afterAdvice);
+ assertEquals("field1", ReturnAspect.afterReturn);
+ assertNull(ReturnAspect.finallyAdvice);
+ assertNull(ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test15()
+ {
+ assertEquals("finally3", pojo.field2);
+
+ assertEquals("around3", ReturnAspect.aroundAdvice);
+ assertEquals("field2", ReturnAspect.aroundReturn);
+ assertEquals("after3", ReturnAspect.afterAdvice);
+ assertEquals("around3", ReturnAspect.afterReturn);
+ assertEquals("finally3", ReturnAspect.finallyAdvice);
+ assertEquals("after3", ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test16()
+ {
+ assertEquals("finally4", pojo.field3);
+
+ assertEquals("around4", ReturnAspect.aroundAdvice);
+ assertEquals("field3", ReturnAspect.aroundReturn);
+ assertEquals("after4", ReturnAspect.afterAdvice);
+ assertEquals("around4", ReturnAspect.afterReturn);
+ assertEquals("finally4", ReturnAspect.finallyAdvice);
+ assertEquals("after4", ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test17()
+ {
+ assertEquals("after5", pojo.field4);
+
+ assertEquals("around5", ReturnAspect.aroundAdvice);
+ assertNull(ReturnAspect.aroundReturn);
+ assertEquals("after5", ReturnAspect.afterAdvice);
+ assertNull(ReturnAspect.afterReturn);
+ assertNull(ReturnAspect.finallyAdvice);
+ assertNull(ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test18()
+ {
+ assertEquals("finally6", pojo.field5);
+
+ assertNull(ReturnAspect.aroundAdvice);
+ assertNull(ReturnAspect.aroundReturn);
+ assertEquals("after6", ReturnAspect.afterAdvice);
+ assertNull(ReturnAspect.afterReturn);
+ assertEquals("finally6", ReturnAspect.finallyAdvice);
+ assertEquals("field5", ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test19()
+ {
+ assertEquals("after7", pojo.field6);
+
+ assertEquals("around7", ReturnAspect.aroundAdvice);
+ assertEquals("field6", ReturnAspect.aroundReturn);
+ assertEquals("after7", ReturnAspect.afterAdvice);
+ assertEquals("around7", ReturnAspect.afterReturn);
+ assertEquals("finally7", ReturnAspect.finallyAdvice);
+ assertNotNull(ReturnAspect.finallyReturn);
+ assertEquals("after7", ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test20()
+ {
+ SubValue value = pojo.field7;
+ assertNotNull(value);
+ assertEquals(8000, value.i);
+
+ assertEquals("around8", ReturnAspect.aroundAdvice);
+ assertNull(ReturnAspect.aroundReturn);
+ assertEquals("after8", ReturnAspect.afterAdvice);
+ assertNull(ReturnAspect.afterReturn);
+ assertEquals("finally8", ReturnAspect.finallyAdvice);
+ assertNull(ReturnAspect.finallyReturn);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test21()
+ {
+ SuperValue value = pojo.field9;
+ assertNotNull(value);
+ assertEquals(10000, value.i);
+
+ assertEquals("around10", ReturnAspect.aroundAdvice);
+ assertNotNull(ReturnAspect.aroundReturn);
+ assertEquals(9, ((SuperValue) ReturnAspect.aroundReturn).i);
+ assertNull(ReturnAspect.afterAdvice);
+ assertNull(ReturnAspect.afterReturn);
+ assertEquals("finally10", ReturnAspect.finallyAdvice);
+ assertNotNull(ReturnAspect.finallyReturn);
+ assertEquals(100, ((SuperValue) ReturnAspect.finallyReturn).i);
+ assertNull(ReturnAspect.finallyThrown);
+ }
+
+ public void test22()
+ {
+ SuperValue value = pojo.field10;
+ assertNotNull(value);
+ assertEquals(11000, value.i);
+
+ assertEquals("around11", ReturnAspect.aroundAdvice);
+ assertNotNull(ReturnAspect.aroundReturn);
+ assertEquals(10, ((SuperValue) ReturnAspect.aroundReturn).i);
+ assertEquals("after11", ReturnAspect.afterAdvice);
+ assertNotNull(ReturnAspect.afterReturn);
+ assertEquals(110, ((SuperValue) ReturnAspect.afterReturn).i);
+ assertEquals("finally11", ReturnAspect.finallyAdvice);
+ assertNotNull(ReturnAspect.finallyReturn);
+ assertEquals(1100, ((SuperValue) ReturnAspect.finallyReturn).i);
+ assertNull(ReturnAspect.finallyThrown);
+ }
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list