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

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

Author: flavia.rainone at jboss.com
Date: 2009-04-28 00:31:45 -0400 (Tue, 28 Apr 2009)
New Revision: 87919

Modified:
   projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml
   projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/arguments/ArgumentsTestCase.java
Log:
[JBAOP-726] Added a precedence declaration to determine the order in which advice should be invoked. Adapted the test assertions to comply with the new advice relative order.

Modified: projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml	2009-04-28 04:29:30 UTC (rev 87918)
+++ projects/aop/trunk/aop/src/resources/test/arguments/jboss-aop.xml	2009-04-28 04:31:45 UTC (rev 87919)
@@ -19,12 +19,12 @@
    <bind pointcut="all(org.jboss.test.aop.arguments.ArgumentsPOJO1)">
 		<stack-ref name="getAndChange"/>
    </bind>
-
+ 
 	<bind pointcut="call(org.jboss.test.aop.arguments.CalledPOJO->new(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
 		<stack-ref name="getAndChange"/>
    </bind>
 
-	<bind pointcut="call(* org.jboss.test.aop.arguments.CalledPOJO->*(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
+   <bind pointcut="call(* org.jboss.test.aop.arguments.CalledPOJO->*(int))" cflow="(ArgumentsPOJO1_constructor OR ArgumentsPOJO1_method)">
 		<stack-ref name="getAndChange"/>
    </bind>
 
@@ -61,4 +61,11 @@
 	<bind pointcut="call(static * org.jboss.test.aop.arguments.CalledPOJO->*(int))" cflow="(ArgumentsPOJO2_constructor OR ArgumentsPOJO2_method)">
       <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
    </bind>
+   
+   <precedence>
+      <advice name="getArgumentsAdvice1" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="setArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="getArgumentsAdvice2" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+      <advice name="getAndChangeArgumentsAdvice" aspect="org.jboss.test.aop.arguments.ArgumentsAspect"/>
+   </precedence>
 </aop>
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/arguments/ArgumentsTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/arguments/ArgumentsTestCase.java	2009-04-28 04:29:30 UTC (rev 87918)
+++ projects/aop/trunk/aop/src/test/java/org/jboss/test/aop/arguments/ArgumentsTestCase.java	2009-04-28 04:31:45 UTC (rev 87919)
@@ -231,12 +231,12 @@
    public void testConCallStaticPOJO1()
    {
       ArgumentsPOJO1 pojo = new ArgumentsPOJO1(Call.STATIC_METHOD, -2041);
-      assertEquals(36, pojo.arg);
+      assertEquals(17, pojo.arg);
       
       assertNotNull(ArgumentsAspect.arguments1);
-      assertSame(ArgumentsAspect.arguments1, ArgumentsAspect.arguments2);
+      assertNotSame(ArgumentsAspect.arguments1, ArgumentsAspect.arguments2);
       assertEquals(1, ArgumentsAspect.arguments1.length);
-      assertEquals(-1020, ((Integer) ArgumentsAspect.arguments1[0]).intValue());
+      assertEquals(-2041, ((Integer) ArgumentsAspect.arguments1[0]).intValue());
    }
    
    public void testConCallStaticPOJO2()
@@ -255,12 +255,12 @@
    public void testMethodCallStaticPOJO1()
    {
       // intercepted twice by each advice: once for caller, once for called
-      assertEquals(36, pojo1.callPOJOStatic(123456));
+      assertEquals(17, pojo1.callPOJOStatic(123456));
       
       assertNotNull(ArgumentsAspect.arguments1);
-      assertSame(ArgumentsAspect.arguments1, ArgumentsAspect.arguments2);
+      assertNotSame(ArgumentsAspect.arguments1, ArgumentsAspect.arguments2);
       assertEquals(1, ArgumentsAspect.arguments1.length);
-      assertEquals(30864, ((Integer) ArgumentsAspect.arguments1[0]).intValue());
+      assertEquals(61728, ((Integer) ArgumentsAspect.arguments1[0]).intValue());
    }
    
    public void testMethodCallStaticPOJO2()