[jboss-cvs] JBossAS SVN: r63365 - projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated.

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

Author: kabir.khan at jboss.com
Date: 2007-06-05 16:37:57 -0400 (Tue, 05 Jun 2007)
New Revision: 63365

Modified:
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/AnnotatedTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/Precedence2.java
Log:
Make the precedence part of the test more resilient, and independent of which precedence definitions get added first

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/AnnotatedTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/AnnotatedTestCase.java	2007-06-05 19:21:01 UTC (rev 63364)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/AnnotatedTestCase.java	2007-06-05 20:37:57 UTC (rev 63365)
@@ -321,14 +321,19 @@
       VariaPOJO pojo = new VariaPOJO();
 
       pojo.precedenceMethod();
-      String[] expected = {"PrecedenceInterceptor1", "PrecedenceAspect1.advice1", "PrecedenceAspect1.advice2", "PrecedenceInterceptor2"};
       java.util.ArrayList intercepted = Interceptions.intercepted;
-      assertEquals("Wrong number of interceptions", expected.length ,intercepted.size());
+      assertEquals("Wrong number of interceptions", 4 ,intercepted.size());
 
-      for (int i = 0 ; i < expected.length ; i++)
-      {
-         assertEquals("Wrong interception at index " + i, expected[i], (String)intercepted.get(i));
-      }
+      int precedenceIntercptor1 = intercepted.indexOf("PrecedenceInterceptor1");
+      int precedenceAspect_advice1 = intercepted.indexOf("PrecedenceAspect1.advice1");
+      int precedenceAspect_advice2 = intercepted.indexOf("PrecedenceAspect1.advice2");
+      int precedenceIntercptor2 = intercepted.indexOf("PrecedenceInterceptor2");
+      
+      assertTrue("PrecedenceInterceptor1 must come before PrecedenceInterceptor2 as defined in Precedence1", precedenceIntercptor1 < precedenceIntercptor2);
+      
+      assertEquals("PrecedenceInterceptor2 must be the last element", 3, precedenceIntercptor2);
+      assertTrue("PrecedenceInterceptor.advice2 must come before PrecedenceInterceptor.advice1 as defined in Precedence2", precedenceAspect_advice2 < precedenceAspect_advice1);
+      assertTrue("PrecedenceInterceptor.advice1 must come before PrecedenceInterceptor.advice1 as defined in Precedence2", precedenceAspect_advice1 < precedenceIntercptor2);
    }
 
    /**

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/Precedence2.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/Precedence2.java	2007-06-05 19:21:01 UTC (rev 63364)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15annotated/Precedence2.java	2007-06-05 20:37:57 UTC (rev 63365)
@@ -31,10 +31,10 @@
 @org.jboss.aop.Precedence
 public class Precedence2
 {
-   @PrecedenceAdvice ("advice1")
+   @PrecedenceAdvice ("advice2")
    PrecedenceAspect1 advice1;
 
-   @PrecedenceAdvice ("advice2")
+   @PrecedenceAdvice ("advice1")
    PrecedenceAspect1 advice2;
    
    @PrecedenceInterceptor