[jboss-cvs] JBossAS SVN: r63440 - projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve.

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

Author: flavia.rainone at jboss.com
Date: 2007-06-09 16:31:33 -0400 (Sat, 09 Jun 2007)
New Revision: 63440

Modified:
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/InfoResolveAnnotationTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java
Log:
[JBAOP-373] Test InfoResolveAnnotationTestCase updated with new info interfaces.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/InfoResolveAnnotationTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/InfoResolveAnnotationTestCase.java	2007-06-09 05:32:34 UTC (rev 63439)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/InfoResolveAnnotationTestCase.java	2007-06-09 20:31:33 UTC (rev 63440)
@@ -21,9 +21,10 @@
 */ 
 package org.jboss.test.aop.inforesolve;
 
-import org.jboss.aop.ConstructorInfo;
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.MethodInfo;
+import org.jboss.aop.joinpoint.ConstructorExecution;
+import org.jboss.aop.joinpoint.FieldAccess;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodExecution;
 import org.jboss.test.aop.AOPTestWithSetup;
 
 /**
@@ -43,37 +44,37 @@
       ResolveAnnotationAspect.clear();
       POJO pojo = new POJO();
       assertNotNull(pojo);
-      check(ConstructorInfo.class, "class", "ctor");
+      check(ConstructorExecution.class, "class", "ctor");
       
       ResolveAnnotationAspect.clear();
       pojo.field = 100;
-      check(FieldInfo.class, "class", "field");
+      check(FieldAccess.class, "class", "field");
       
       ResolveAnnotationAspect.clear();
       assertEquals(100, pojo.field);
-      check(FieldInfo.class, "class", "field");
+      check(FieldAccess.class, "class", "field");
       
       ResolveAnnotationAspect.clear();
       POJO.staticField = 101;
-      check(FieldInfo.class, "class", "staticField");
+      check(FieldAccess.class, "class", "staticField");
       
       ResolveAnnotationAspect.clear();
       assertEquals(101, POJO.staticField);
-      check(FieldInfo.class, "class", "staticField");
+      check(FieldAccess.class, "class", "staticField");
       
       ResolveAnnotationAspect.clear();
       assertEquals(201, pojo.method(200));
-      check(MethodInfo.class, "class", "method");
+      check(MethodExecution.class, "class", "method");
       
       ResolveAnnotationAspect.clear();
       assertEquals(302, pojo.staticMethod(300));
-      check(MethodInfo.class, "class", "staticMethod");
+      check(MethodExecution.class, "class", "staticMethod");
    }
    
-   private void check(Class expectedInfoClazz, String expectedClassString, String expectedJoinPointString)
+   private void check(Class<? extends JoinPointBean> expectedInfoClazz, String expectedClassString, String expectedJoinPointString)
    {
-      assertNotNull(ResolveAnnotationAspect.info);
-      assertEquals(expectedInfoClazz, ResolveAnnotationAspect.info.getClass());
+      assertNotNull(ResolveAnnotationAspect.joinPoint);
+      assertTrue(expectedInfoClazz.isAssignableFrom(ResolveAnnotationAspect.joinPoint.getClass()));
       assertNotNull(ResolveAnnotationAspect.classAnnotation);
       assertEquals(expectedClassString, ResolveAnnotationAspect.classAnnotation.value());
       assertNotNull(ResolveAnnotationAspect.joinpointAnnotation);

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java	2007-06-09 20:31:33 UTC (rev 63440)
@@ -21,8 +21,8 @@
 */ 
 package org.jboss.test.aop.inforesolve;
 
-import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.annotation.JoinPoint;
+import org.jboss.aop.joinpoint.JoinPointBean;
 
 /**
  * 
@@ -31,27 +31,27 @@
  */
 public class ResolveAnnotationAspect
 {
-   public static JoinPointInfo info;
+   public static JoinPointBean joinPoint;
    public static TestAnnotation classAnnotation;
    public static TestAnnotation joinpointAnnotation;
    
    public static void clear()
    {
-      info = null;
+      joinPoint = null;
       classAnnotation = null;
       joinpointAnnotation = null;
    }
    
-   public void before(@JoinPoint JoinPointInfo info)
+   public void before(@JoinPoint JoinPointBean joinPoint)
    {
-      this.info = info;
-      if (info == null)
+      this.joinPoint = joinPoint;
+      if (joinPoint == null)
       {
          //This is an error but will be picked up by the test
          return;
       }
          
-      classAnnotation = (TestAnnotation)info.resolveClassAnnotation(TestAnnotation.class);
-      joinpointAnnotation = (TestAnnotation)info.resolveAnnotation(TestAnnotation.class);
+      classAnnotation = (TestAnnotation)joinPoint.resolveClassAnnotation(TestAnnotation.class);
+      joinpointAnnotation = (TestAnnotation)joinPoint.resolveAnnotation(TestAnnotation.class);
    }
 }