[jboss-cvs] JBossAS SVN: r65763 - 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 10:19:41 -0400 (Tue, 02 Oct 2007)
New Revision: 65763

Modified:
   projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.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
Log:
[JBAOP-471] Added tests of @Arg-annotated params applied to field write interception (whose absence hide this bug)

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 14:03:10 UTC (rev 65762)
+++ projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml	2007-10-02 14:19:41 UTC (rev 65763)
@@ -225,6 +225,16 @@
       <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
 
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->field3)">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+   </bind>
+   
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field3Before3)">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+   </bind>
+   
    <aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2" scope="PER_VM"/>
 
    <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO2->bunchArgs(..))">

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.java	2007-10-02 14:03:10 UTC (rev 65762)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.java	2007-10-02 14:19:41 UTC (rev 65763)
@@ -716,6 +716,21 @@
       assertTrue(thrown);
    }
    
+   public void test12()
+   {
+      boolean thrown = false;
+      try
+      {
+         pojo.field3Before3 = 10;
+      }
+      catch (NoMatchingAdviceException e)
+      {
+         thrown = true;
+         e.printStackTrace();
+      }
+      assertTrue(thrown);
+   }
+   
    public void testInverted1()
    {
       boolean thrown = false;

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 14:03:10 UTC (rev 65762)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java	2007-10-02 14:19:41 UTC (rev 65763)
@@ -369,6 +369,19 @@
       assertTrue(ArgAspectInterfaces.finally3);
    }
    
+   public void test12()
+   {
+      pojo.field3 = 12;
+      
+      assertTrue(ArgAspect.before1);
+      assertTrue(ArgAspect.before2);
+      assertTrue(ArgAspect.finally1);
+      
+      assertEquals(12, ArgAspect.before1X);
+      assertEquals(12, ArgAspect.before2X);
+      assertEquals(12, ArgAspect.finally1X);
+   }
+   
    public void testInverted1()
    {
       pojo.method11("testInverted", null);

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-02 14:03:10 UTC (rev 65762)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java	2007-10-02 14:19:41 UTC (rev 65763)
@@ -49,6 +49,7 @@
    public String field2Finally2;
    
    /* int field3 */
+   public int field3Before3;
    public int field3After4;
    public int field3After5;