[jboss-cvs] JBossAS SVN: r65756 - in projects/aop/trunk/aop/src: test/org/jboss/test/aop/annotatedAdviceParams and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: flavia.rainone at jboss.com
Date: 2007-10-02 09:17:09 -0400 (Tue, 02 Oct 2007)
New Revision: 65756

Modified:
   projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java
Log:
[JBAOP-472] Tests for generic field interception.

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-02 13:10:34 UTC (rev 65755)
+++ projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml	2007-10-02 13:17:09 UTC (rev 65756)
@@ -347,7 +347,7 @@
    
    <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->*(java.util.List)) OR set(java.util.List org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*)">
       <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
       <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
       <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>

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-02 13:10:34 UTC (rev 65755)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java	2007-10-02 13:17:09 UTC (rev 65756)
@@ -474,4 +474,34 @@
       assertTrue(ArgAspectGenerics.finally4);
       assertTrue(ArgAspectGenerics.finally6);
    }
+   
+   public void testGenerics3()
+   {
+      pojo.field5 = new ArrayList<SuperValue>();
+      assertTrue(ArgAspectGenerics.before1);
+      assertTrue(ArgAspectGenerics.before2);
+      assertTrue(ArgAspectGenerics.before4);
+      assertTrue(ArgAspectGenerics.before5);
+      assertTrue(ArgAspectGenerics.before6);
+      assertTrue(ArgAspectGenerics.around1);
+      assertTrue(ArgAspectGenerics.around2);
+      assertTrue(ArgAspectGenerics.around3);
+      assertTrue(ArgAspectGenerics.around4);
+      assertTrue(ArgAspectGenerics.around6);
+      assertTrue(ArgAspectGenerics.after1);
+      assertTrue(ArgAspectGenerics.after2);
+      assertTrue(ArgAspectGenerics.after3);
+      assertTrue(ArgAspectGenerics.after4);
+      assertTrue(ArgAspectGenerics.after6);
+      assertFalse(ArgAspectGenerics.throwing1);
+      assertFalse(ArgAspectGenerics.throwing3);
+      assertFalse(ArgAspectGenerics.throwing4);
+      assertFalse(ArgAspectGenerics.throwing5);
+      assertFalse(ArgAspectGenerics.throwing6);
+      assertTrue(ArgAspectGenerics.finally1);
+      assertTrue(ArgAspectGenerics.finally2);
+      assertTrue(ArgAspectGenerics.finally3);
+      assertTrue(ArgAspectGenerics.finally4);
+      assertTrue(ArgAspectGenerics.finally6);
+   }
 }
\ 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-02 13:10:34 UTC (rev 65755)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java	2007-10-02 13:17:09 UTC (rev 65756)
@@ -39,6 +39,8 @@
    
    public static boolean field4;
    
+   public List<SuperValue> field5;
+   
    public int bunch1(int x, double y, float z, String str, int q)
    {
       return x + (int) y + (int) z + q;