[jboss-cvs] JBossAS SVN: r59784 - branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field.

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

Author: kabir.khan at jboss.com
Date: 2007-01-18 11:56:02 -0500 (Thu, 18 Jan 2007)
New Revision: 59784

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/SubSubPOJO.java
Log:
Expand testfield testcase to cover what I think user means in
http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4003309#4003309

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-18 15:46:19 UTC (rev 59783)
+++ branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/FieldTestCase.java	2007-01-18 16:56:02 UTC (rev 59784)
@@ -88,16 +88,57 @@
       pojo.mine = 5;
       assertTrue(TraceInterceptor.intercepted);
 
+      TraceInterceptor.intercepted = false;
+      assertEquals(5, pojo.mine);
+      assertTrue(TraceInterceptor.intercepted);
 
       TraceInterceptor.intercepted = false;
-      pojo.pojoInherited = 5;
+      pojo.pojoInherited = 6;
       assertTrue(TraceInterceptor.intercepted);
 
       TraceInterceptor.intercepted = false;
-      pojo.subpojoInherited = 5;
+      assertEquals(6, pojo.pojoInherited);
       assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      pojo.subpojoInherited = 7;
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      assertEquals(7, pojo.subpojoInherited);
+      assertTrue(TraceInterceptor.intercepted);
    }
 
+   public void testFieldInheritanceInSubClass()
+   {
+      SubSubPOJO pojo = new SubSubPOJO(5);
+      
+      TraceInterceptor.intercepted = false;
+      pojo.updateMine(5);
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      assertEquals(5, pojo.useMine());
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      pojo.updatePojoInherited(6);
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      assertEquals(6, pojo.usePojoInherited());
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      pojo.updateSubPojoInherited(7);
+      assertTrue(TraceInterceptor.intercepted);
+
+      TraceInterceptor.intercepted = false;
+      assertEquals(7, pojo.useSubPojoInherited());
+      assertTrue(TraceInterceptor.intercepted);
+   }
+   
+   
    public void testSuperPrivateField()
    {
       POJO pojo = new POJO();
@@ -119,6 +160,8 @@
       TraceInterceptor.intercepted = false;
       assertEquals(5, sub.getPrivate());
       assertTrue(TraceInterceptor.intercepted);
+      
+      
    }
    
    public void testPerJoinpoint() throws Exception

Modified: branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java	2007-01-18 15:46:19 UTC (rev 59783)
+++ branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/field/SubSubPOJO.java	2007-01-18 16:56:02 UTC (rev 59784)
@@ -42,5 +42,34 @@
       return field;
    }
    
-
+   public int useMine()
+   {
+      return mine;
+   }
+   
+   public void updateMine(int i)
+   {
+      mine = i;
+   }
+   
+   public int useSubPojoInherited()
+   {
+      return subpojoInherited;
+   }
+   
+   public void updateSubPojoInherited(int i)
+   {
+      subpojoInherited = i;
+   }
+   
+   public int usePojoInherited()
+   {
+      return pojoInherited;
+   }
+   
+   public void updatePojoInherited(int i)
+   {
+      pojoInherited = i;
+   }
+   
 }