[Jboss-cvs] JBossAS SVN: r56857 - in trunk/aop/src: resources/test/extender test/org/jboss/test/aop/extender

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

Author: kabir.khan at jboss.com
Date: 2006-09-14 12:44:30 -0400 (Thu, 14 Sep 2006)
New Revision: 56857

Modified:
   trunk/aop/src/resources/test/extender/jboss-aop.xml
   trunk/aop/src/test/org/jboss/test/aop/extender/Base.java
   trunk/aop/src/test/org/jboss/test/aop/extender/ChildBase.java
   trunk/aop/src/test/org/jboss/test/aop/extender/ExtenderTestCase.java
   trunk/aop/src/test/org/jboss/test/aop/extender/InfantBase.java
   trunk/aop/src/test/org/jboss/test/aop/extender/SubBase.java
Log:
[JBAOP-285] Add failing test

Modified: trunk/aop/src/resources/test/extender/jboss-aop.xml
===================================================================
--- trunk/aop/src/resources/test/extender/jboss-aop.xml	2006-09-14 16:39:36 UTC (rev 56856)
+++ trunk/aop/src/resources/test/extender/jboss-aop.xml	2006-09-14 16:44:30 UTC (rev 56857)
@@ -6,6 +6,7 @@
 
 <aop>
 
+	<aspect class="org.jboss.test.aop.extender.SuperCallAspect"/>
    <prepare expr="all(org.jboss.test.aop.extender.Base)"/>
    <prepare expr="all(org.jboss.test.aop.extender.Extender)"/>
    <bind pointcut="execution(* org.jboss.test.aop.extender.ChildBase->updateBase())">
@@ -24,4 +25,7 @@
       <interceptor class="org.jboss.test.aop.extender.ExtenderInterceptor"/>
    </bind>
    
+   <bind pointcut="execution(* $instanceof{org.jboss.test.aop.extender.Base}->superCall())">
+   	<advice aspect="org.jboss.test.aop.extender.SuperCallAspect" name="invoke"/>
+   </bind>
 </aop>

Modified: trunk/aop/src/test/org/jboss/test/aop/extender/Base.java
===================================================================
--- trunk/aop/src/test/org/jboss/test/aop/extender/Base.java	2006-09-14 16:39:36 UTC (rev 56856)
+++ trunk/aop/src/test/org/jboss/test/aop/extender/Base.java	2006-09-14 16:44:30 UTC (rev 56857)
@@ -38,4 +38,9 @@
    {
       base = val;
    }
+   
+   public void superCall()
+   {
+      
+   }
  }
\ No newline at end of file

Modified: trunk/aop/src/test/org/jboss/test/aop/extender/ChildBase.java
===================================================================
--- trunk/aop/src/test/org/jboss/test/aop/extender/ChildBase.java	2006-09-14 16:39:36 UTC (rev 56856)
+++ trunk/aop/src/test/org/jboss/test/aop/extender/ChildBase.java	2006-09-14 16:44:30 UTC (rev 56857)
@@ -39,4 +39,8 @@
    }
    
 
+   public void superCall()
+   {
+      super.superCall();
+   }
 }

Modified: trunk/aop/src/test/org/jboss/test/aop/extender/ExtenderTestCase.java
===================================================================
--- trunk/aop/src/test/org/jboss/test/aop/extender/ExtenderTestCase.java	2006-09-14 16:39:36 UTC (rev 56856)
+++ trunk/aop/src/test/org/jboss/test/aop/extender/ExtenderTestCase.java	2006-09-14 16:44:30 UTC (rev 56857)
@@ -21,6 +21,10 @@
 */ 
 package org.jboss.test.aop.extender;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import org.jboss.test.aop.AOPTestWithSetup;
 
 /**
@@ -71,4 +75,11 @@
     
    }
 
+   public void testSuperCall() throws Exception
+   {
+      SuperCallAspect.interceptions = 0;
+      InfantBase infant = new InfantBase();
+      infant.superCall();
+      assertEquals(4, SuperCallAspect.interceptions);
+   }
 }

Modified: trunk/aop/src/test/org/jboss/test/aop/extender/InfantBase.java
===================================================================
--- trunk/aop/src/test/org/jboss/test/aop/extender/InfantBase.java	2006-09-14 16:39:36 UTC (rev 56856)
+++ trunk/aop/src/test/org/jboss/test/aop/extender/InfantBase.java	2006-09-14 16:44:30 UTC (rev 56857)
@@ -33,5 +33,9 @@
    {
       setBase(i-1);
    }
-
+   
+   public void superCall()
+   {
+      super.superCall();
+   }
 }

Modified: trunk/aop/src/test/org/jboss/test/aop/extender/SubBase.java
===================================================================
--- trunk/aop/src/test/org/jboss/test/aop/extender/SubBase.java	2006-09-14 16:39:36 UTC (rev 56856)
+++ trunk/aop/src/test/org/jboss/test/aop/extender/SubBase.java	2006-09-14 16:44:30 UTC (rev 56857)
@@ -33,4 +33,8 @@
       
    }
 
+   public void superCall()
+   {
+      super.superCall();
+   }
 }