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

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

Author: stalep
Date: 2008-05-01 17:47:46 -0400 (Thu, 01 May 2008)
New Revision: 72959

Modified:
   projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainInterceptor.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainTestCase.java
Log:
[JBAOP-433] updated test


Modified: projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml	2008-05-01 20:57:29 UTC (rev 72958)
+++ projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml	2008-05-01 21:47:46 UTC (rev 72959)
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
 <prepare expr="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())" />
-<!--  
-  
-                                
-   <bind pointcut="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())">                
+
+<!--
+  <bind pointcut="call(* org.jboss.test.aop.rebuildcallerchain.*->execute())">                
        <interceptor class="org.jboss.test.aop.rebuildcallerchain.RebuildCallerChainInterceptor"/>
   </bind>
+  -->
 
-   -->
    
   
 </aop>

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainInterceptor.java	2008-05-01 20:57:29 UTC (rev 72958)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainInterceptor.java	2008-05-01 21:47:46 UTC (rev 72959)
@@ -28,11 +28,12 @@
 /**
  * A RebuilCallInterceptor.
  * 
- * @author <a href="RebuildCallInterceptorle W. Pedersen</a>
+ * @author <a href="stale.pedersen at jboss.org">Stale W. Pedersen</a>
  * @version $Revision: 1.1 $
  */
 public class RebuildCallerChainInterceptor implements Interceptor
 {
+   public static boolean method = false;
    //@Override
    public String getName()
    {
@@ -44,8 +45,9 @@
    {
       try
       {
-         System.out.println("Interceptor ignoring call...");
-         return null;
+//         System.out.println("Interceptor ignoring call...");
+         method = true;
+         return invocation.invokeNext();
       }
       catch(Exception e)
       {

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainTestCase.java	2008-05-01 20:57:29 UTC (rev 72958)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainTestCase.java	2008-05-01 21:47:46 UTC (rev 72959)
@@ -53,7 +53,7 @@
    {
       try
       {
-         new Caller1().execute();
+//         new Caller1().execute();
 
          AdviceBinding bindingCall = new AdviceBinding( 
                "call(* org.jboss.test.aop.rebuildcallerchain.*->execute())", null); 
@@ -62,9 +62,11 @@
          AspectManager.instance().addBinding(bindingCall); 
 
          new Caller1().execute(); // loaded before addBinding => not ok 
+         assertTrue("caller1 was not rebuilded", RebuildCallerChainInterceptor.method);
+         RebuildCallerChainInterceptor.method = false;
          new Caller2().execute(); // loaded after addBindingok => ok 
-
-         assertTrue("Rebuilded chain", true);
+         assertTrue("caller2 not ok", RebuildCallerChainInterceptor.method);
+//         assertTrue("Rebuilded chain", true);
       } 
       catch (Exception e) 
       {