[jboss-cvs] JBossAS SVN: r58896 - in projects/aop/trunk/aop/src: resources/test/beforeafterArgs test/org/jboss/test/aop/beforeafterArgs

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

Author: flavia.rainone
Date: 2006-12-06 22:49:22 -0500 (Wed, 06 Dec 2006)
New Revision: 58896

Modified:
   projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java
Log:
[JBAOP-37] Added case where the type of joinpoint (field read/write) controls which advice must be called

Modified: projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml	2006-12-07 03:40:06 UTC (rev 58895)
+++ projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml	2006-12-07 03:49:22 UTC (rev 58896)
@@ -156,6 +156,10 @@
    	<before name="before12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
   	</bind>
   	
+  	<bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->text)">
+  	   <before name="before13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
+  	</bind>
+  	
    <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect" scope="PER_VM"/>
   	   
   	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method1(int,long))">

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java	2006-12-07 03:40:06 UTC (rev 58895)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java	2006-12-07 03:49:22 UTC (rev 58896)
@@ -75,6 +75,10 @@
       assertEquals("String", OverloadedBeforeAspect.before10);
       assertEquals("Object", OverloadedBeforeAspect.before11);
       assertEquals("", OverloadedBeforeAspect.before12);
+      assertEquals("FieldInfo,String", OverloadedBeforeAspect.before13);
+      String myText = pojo.text;
+      assertEquals("FieldInfo", OverloadedBeforeAspect.before13);
+      
    }
    
    public void test2()

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java	2006-12-07 03:40:06 UTC (rev 58895)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java	2006-12-07 03:49:22 UTC (rev 58896)
@@ -48,6 +48,7 @@
    static String before10 = null;
    static String before11 = null;
    static String before12 = null;
+   static String before13 = null;
    
    public static void clear()
    {
@@ -63,6 +64,7 @@
       before10 = null;
       before11 = null;
       before12 = null;
+      before13 = null;
    }
    
    /* BEFORE1 ADVICE */
@@ -553,4 +555,14 @@
    {
       Assert.fail("This advice should never be executed");
    }
+   
+   public void before13(@JoinPoint FieldInfo fieldInfo, @Arg String text)
+   {
+      before13 = "FieldInfo,String";
+   }
+   
+   public void before13(@JoinPoint FieldInfo fieldInfo)
+   {
+      before13 = "FieldInfo";
+   }
 }
\ No newline at end of file