[jboss-cvs] JBossAS SVN: r87954 - in projects/aop/branches/Branch_2_1/aop/src: resources/test/precedence and 1 other directories.

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

Author: flavia.rainone at jboss.com
Date: 2009-04-28 13:42:21 -0400 (Tue, 28 Apr 2009)
New Revision: 87954

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/ClassAdvisor.java
   projects/aop/branches/Branch_2_1/aop/src/resources/test/precedence/jboss-aop.xml
   projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/POJO.java
   projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/PrecedenceTester.java
Log:
[JBAOP-727] Added a call to applyPrecedence at all finalize*CalledBy*InterceptorChain methods belonging to ClassAdvisor. Added call scenarios to precedence tests.

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/ClassAdvisor.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/ClassAdvisor.java	2009-04-28 17:38:55 UTC (rev 87953)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/ClassAdvisor.java	2009-04-28 17:42:21 UTC (rev 87954)
@@ -1022,7 +1022,7 @@
       Interceptor[] interceptors = null;
       if (list.size() > 0)
       {
-         interceptors = list.toArray(new Interceptor[list.size()]);
+         interceptors = applyPrecedence(list.toArray(new Interceptor[list.size()]));
       }
       info.setInterceptors(interceptors);
    }
@@ -1034,7 +1034,7 @@
       Interceptor[] interceptors = null;
       if (list.size() > 0)
       {
-         interceptors = list.toArray(new Interceptor[list.size()]);
+         interceptors = applyPrecedence(list.toArray(new Interceptor[list.size()]));
       }
       info.setInterceptors(interceptors);
    }
@@ -1060,7 +1060,7 @@
       Interceptor[] interceptors = null;
       if (list.size() > 0)
       {
-         interceptors = list.toArray(new Interceptor[list.size()]);
+         interceptors = applyPrecedence(list.toArray(new Interceptor[list.size()]));
       }
       info.setInterceptors(interceptors);
    }
@@ -1086,7 +1086,7 @@
       Interceptor[] interceptors = null;
       if (list.size() > 0)
       {
-         interceptors = list.toArray(new Interceptor[list.size()]);
+         interceptors = applyPrecedence(list.toArray(new Interceptor[list.size()]));
       }
       info.setInterceptors(interceptors);
    }

Modified: projects/aop/branches/Branch_2_1/aop/src/resources/test/precedence/jboss-aop.xml
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/resources/test/precedence/jboss-aop.xml	2009-04-28 17:38:55 UTC (rev 87953)
+++ projects/aop/branches/Branch_2_1/aop/src/resources/test/precedence/jboss-aop.xml	2009-04-28 17:42:21 UTC (rev 87954)
@@ -70,7 +70,7 @@
        <advice aspect="org.jboss.test.aop.precedence.LastAspect2" name="advice"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.precedence.POJO->twoMethod())">
+   <bind pointcut="execution(* org.jboss.test.aop.precedence.POJO->twoMethod()) OR call(* org.jboss.test.aop.precedence.POJO->fiveMethod())">
        <interceptor-ref name="org.jboss.test.aop.precedence.FirstInterceptor"/>    
        <interceptor-ref name="org.jboss.test.aop.precedence.FirstInterceptor2"/>    
        <interceptor-ref name="org.jboss.test.aop.precedence.SimpleInterceptor"/>
@@ -82,7 +82,7 @@
        <advice aspect="org.jboss.test.aop.precedence.LastAspect2" name="advice"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.precedence.POJO->threeMethod())">
+   <bind pointcut="execution(* org.jboss.test.aop.precedence.POJO->threeMethod()) OR call(org.jboss.test.aop.precedence.POJO->new(java.lang.String))">
        <interceptor-ref name="org.jboss.test.aop.precedence.FirstInterceptor"/>    
        <interceptor-ref name="org.jboss.test.aop.precedence.FirstInterceptor2"/>    
        <advice aspect="org.jboss.test.aop.precedence.TestAspect" name="advice"/>

Modified: projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/POJO.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/POJO.java	2009-04-28 17:38:55 UTC (rev 87953)
+++ projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/POJO.java	2009-04-28 17:42:21 UTC (rev 87954)
@@ -35,6 +35,16 @@
       System.out.println("*** POJO constructor");
    }
    
+   public POJO(String arg)
+   {
+      System.out.println("*** POJO called constructor");
+   }
+   
+   public static POJO factoryMethod()
+   {
+      return new POJO("factory");
+   }
+   
    public void oneMethod()
    {
       System.out.println("*** POJO oneMethod");
@@ -49,4 +59,15 @@
    {
       System.out.println("*** POJO threeMethod");
    }
+   
+   public void fourMethod()
+   {
+      System.out.println("*** POJO fourMethod");
+      this.fiveMethod();
+   }
+   
+   public void fiveMethod()
+   {
+      System.out.println("*** POJO fiveMethod");
+   }
 }

Modified: projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/PrecedenceTester.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/PrecedenceTester.java	2009-04-28 17:38:55 UTC (rev 87953)
+++ projects/aop/branches/Branch_2_1/aop/src/test/java/org/jboss/test/aop/precedence/PrecedenceTester.java	2009-04-28 17:42:21 UTC (rev 87954)
@@ -121,6 +121,14 @@
       Interceptions.reset();
       pojo.threeMethod();
       checkInterceptions(PRECEDENCE_THREE);
+      
+      Interceptions.reset();
+      pojo.fourMethod();
+      checkInterceptions(PRECEDENCE_TWO);
+      
+      Interceptions.reset();
+      POJO.factoryMethod();
+      checkInterceptions(PRECEDENCE_THREE);
    }
 
    private void checkInterceptions(String[] expected)