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

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

Author: flavia.rainone at jboss.com
Date: 2008-05-09 16:54:37 -0400 (Fri, 09 May 2008)
New Revision: 73238

Modified:
   projects/aop/trunk/aop/src/resources/test/scope/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/POJOWithNullAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/ScopeTestCase.java
Log:
[JBAOP-560] Tests for call joinpoints have been added to ScopedTestCase.testNullAspectFactory().

Modified: projects/aop/trunk/aop/src/resources/test/scope/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/scope/jboss-aop.xml	2008-05-09 20:39:55 UTC (rev 73237)
+++ projects/aop/trunk/aop/src/resources/test/scope/jboss-aop.xml	2008-05-09 20:54:37 UTC (rev 73238)
@@ -140,18 +140,30 @@
       <stack-ref name="nullFactoryStack"/>
    </bind>
    
-   <bind pointcut="construction(org.jboss.test.aop.scope.POJOWithNullAspect->new(..))">
+   <bind pointcut="construction(org.jboss.test.aop.scope.POJOWithNullAspect->new())">
       <stack-ref name="nullFactoryStack"/>
    </bind>
    
-   <bind pointcut="execution(org.jboss.test.aop.scope.POJOWithNullAspect->new(..))">
+   <bind pointcut="execution(org.jboss.test.aop.scope.POJOWithNullAspect->new())">
       <stack-ref name="nullFactoryStack"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.scope.POJOWithNullAspect->*(..))">
+   <bind pointcut="execution(* org.jboss.test.aop.scope.POJOWithNullAspect->method(..))">
       <stack-ref name="nullFactoryStack"/>
    </bind>
    
+   <bind pointcut="execution(* org.jboss.test.aop.scope.POJOWithNullAspect->staticMethod(..))">
+      <stack-ref name="nullFactoryStack"/>
+   </bind>
+   
+   <bind pointcut="call(* org.jboss.test.aop.scope.POJOWithNullAspect->calledMethod*(..))">
+      <stack-ref name="nullFactoryStack"/>
+   </bind>
+   
+   <bind pointcut="call(org.jboss.test.aop.scope.POJOWithNullAspect->new(int))">
+      <stack-ref name="nullFactoryStack"/>
+   </bind>
+   
    <!-- PER_INSTANCE AND PER_CLASS -->
    <bind pointcut="execution(* org.jboss.test.aop.scope.POJOWithInstanceAndClass->method(..))">
       <interceptor-ref name="joinpointInterceptor"/>

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/POJOWithNullAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/POJOWithNullAspect.java	2008-05-09 20:39:55 UTC (rev 73237)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/POJOWithNullAspect.java	2008-05-09 20:54:37 UTC (rev 73238)
@@ -28,11 +28,42 @@
  */
 public class POJOWithNullAspect
 {
+   // for get and set joinpoints
    public int field;
    public static int staticField;
+   
+   // for execution and construction joinpoints
    public POJOWithNullAspect() {}
+   
+   // for execution joinpoints
    public void method() {}
    public static void staticMethod() {}
+   
+   // for call joinpoints
+   // callers:
+   public POJOWithNullAspect(int value1, int value2)
+   {
+      POJOWithNullAspect pojo = new POJOWithNullAspect(1);
+      pojo.calledMethod1();
+      calledMethod2();
+   }
+   public void callerMethod1()
+   {
+      POJOWithNullAspect pojo = new POJOWithNullAspect(1);
+      pojo.calledMethod1();
+      calledMethod2();
+   }
+   public static void callerMethod2()
+   {
+      POJOWithNullAspect pojo = new POJOWithNullAspect(2);
+      pojo.calledMethod1();
+      calledMethod2();
+   }
+   // called:
+   public POJOWithNullAspect(int value) {}
+   public void calledMethod1() {}
+   public static void calledMethod2() {}
+   
    // method that will be intercepted by both normal factories and
    // NullAspectFactories
    public void mixedMethod(){}

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/ScopeTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/ScopeTestCase.java	2008-05-09 20:39:55 UTC (rev 73237)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/scope/ScopeTestCase.java	2008-05-09 20:54:37 UTC (rev 73238)
@@ -558,10 +558,13 @@
       int value = POJOWithNullAspect.staticField;
       POJOWithNullAspect.staticField = value + 1;
       POJOWithNullAspect.staticMethod();
+      POJOWithNullAspect.callerMethod2();
       POJOWithNullAspect pojo = new POJOWithNullAspect();
       value += pojo.field;
       pojo.field = value - 10;
       pojo.method();
+      pojo.callerMethod1();
+      new POJOWithNullAspect(3, 4);
       
       // check that mixed method does get correctly intercepted without errors
       Interceptions.clear();