[jboss-cvs] JBossAS SVN: r59527 - in branches/Branch_AOP_1_5/aop/src: test/org/jboss/test/aop/field and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2007-01-11 09:11:28 -0500 (Thu, 11 Jan 2007)
New Revision: 59527

Modified:
   branches/Branch_AOP_1_5/aop/src/resources/test/field/jboss-aop.xml
   branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java
   branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/POJO.java
Log:
Check that private superclass fields get woven

Modified: branches/Branch_AOP_1_5/aop/src/resources/test/field/jboss-aop.xml
===================================================================
--- branches/Branch_AOP_1_5/aop/src/resources/test/field/jboss-aop.xml	2007-01-11 13:55:59 UTC (rev 59526)
+++ branches/Branch_AOP_1_5/aop/src/resources/test/field/jboss-aop.xml	2007-01-11 14:11:28 UTC (rev 59527)
@@ -15,6 +15,9 @@
   <bind pointcut="field(* org.jboss.test.aop.field.SubSubPOJO->mine)">                
        <interceptor class="org.jboss.test.aop.field.TraceInterceptor"/>
   </bind>
+  <bind pointcut="field(* org.jboss.test.aop.field.POJO->privateField)">                
+       <interceptor class="org.jboss.test.aop.field.TraceInterceptor"/>
+  </bind>
 
   <interceptor name="field" class="org.jboss.test.aop.field.FieldPerJoinpointInterceptor" scope="PER_JOINPOINT"/>
   <interceptor name="staticField" class="org.jboss.test.aop.field.FieldPerJoinpointInterceptor" scope="PER_CLASS_JOINPOINT"/>

Modified: branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java	2007-01-11 13:55:59 UTC (rev 59526)
+++ branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java	2007-01-11 14:11:28 UTC (rev 59527)
@@ -98,6 +98,29 @@
       assertTrue(TraceInterceptor.intercepted);
    }
 
+   public void testSuperPrivateField()
+   {
+      POJO pojo = new POJO();
+
+      TraceInterceptor.intercepted = false;
+      pojo.setPrivate(5);
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      assertEquals(5, pojo.getPrivate());
+      assertTrue(TraceInterceptor.intercepted);
+
+      SubPOJO sub = new SubPOJO();
+
+      TraceInterceptor.intercepted = false;
+      sub.setPrivate(5);
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      assertEquals(5, sub.getPrivate());
+      assertTrue(TraceInterceptor.intercepted);
+   }
+   
    public void testPerJoinpoint() throws Exception
    {
       ScopedPojo pojo1 = new ScopedPojo();

Modified: branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/POJO.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/POJO.java	2007-01-11 13:55:59 UTC (rev 59526)
+++ branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/POJO.java	2007-01-11 14:11:28 UTC (rev 59527)
@@ -30,6 +30,7 @@
 {
    int field;
    public int pojoInherited;
+   private int privateField;
    
    public POJO() {}
    
@@ -43,4 +44,13 @@
       return field;
    }
  
+   public void setPrivate(int i)
+   {
+      privateField = i;
+   }
+   
+   public int getPrivate()
+   {
+      return privateField;
+   }
 }