[jboss-cvs] JBossAS SVN: r69035 - 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-01-16 11:12:29 -0500 (Wed, 16 Jan 2008)
New Revision: 69035

Modified:
   projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller1.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller2.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainTestCase.java
Log:
[JBAOP-433] further changes

Modified: projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml	2008-01-16 16:04:06 UTC (rev 69034)
+++ projects/aop/trunk/aop/src/resources/test/rebuildcallerchain/jboss-aop.xml	2008-01-16 16:12:29 UTC (rev 69035)
@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aop>
-  <prepare expr="execution(* org.jboss.test.aop.rebuildcallerchain.*->*())" />
+<prepare expr="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/Caller1.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller1.java	2008-01-16 16:04:06 UTC (rev 69034)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller1.java	2008-01-16 16:12:29 UTC (rev 69035)
@@ -32,6 +32,10 @@
 
    public void execute() throws Exception
    {
-      throw new Exception("This method should not have been called!");
+//      throw new Exception("This method should not have been called!");
    }
+   
+   public void foo() {
+      
+   }
 }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller2.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller2.java	2008-01-16 16:04:06 UTC (rev 69034)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/Caller2.java	2008-01-16 16:12:29 UTC (rev 69035)
@@ -32,6 +32,6 @@
 
    public void execute() throws Exception
    {
-      throw new Exception("This method should not have been called!");
+//      throw new Exception("This method should not have been called!");
    }
 }

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-01-16 16:04:06 UTC (rev 69034)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/rebuildcallerchain/RebuildCallerChainTestCase.java	2008-01-16 16:12:29 UTC (rev 69035)
@@ -56,17 +56,13 @@
       {
          new Caller1().execute();
 
-         // Tests with corresponding prepare statements in jboss-aop.xml. 
-         // Results are the same with <prepare expr="all(testCaseAOP.*)" /> 
-         // 2- Works only on classes that have not been already loaded 
-         // (Caller1) 
          AdviceBinding bindingCall = new AdviceBinding( 
-               "call(* org.jboss.test.aop.rebuildcallerchain.*->*(..))", null); 
+               "call(* org.jboss.test.aop.rebuildcallerchain.*->execute())", null); 
          bindingCall.addInterceptor(RebuildCallerChainInterceptor.class); 
 
          AspectManager.instance().addBinding(bindingCall); 
 
-//         new Caller1().execute(); // loaded before addBinding => not ok 
+         new Caller1().execute(); // loaded before addBinding => not ok 
          new Caller2().execute(); // loaded after addBindingok => ok 
 
          assertTrue("Rebuilded chain", true);