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

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

Author: flavia.rainone at jboss.com
Date: 2007-02-05 08:58:11 -0500 (Mon, 05 Feb 2007)
New Revision: 60291

Modified:
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsPOJO.java
Log:
[JBAOP-352] Test bugs solved.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsAspect.java	2007-02-05 13:57:42 UTC (rev 60290)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsAspect.java	2007-02-05 13:58:11 UTC (rev 60291)
@@ -89,11 +89,15 @@
       {
          ((MethodInvocation) invocation).setArguments(arguments);
       }
-      else if (invocation instanceof ConstructorCalledByConstructorInvocation)
+      else if (invocation instanceof ConstructorCalledByConstructorInvocation &&
+            // avoid constructors that receive an intance of Call enum
+            ((ConstructorCalledByConstructorInvocation) invocation).getArguments().length == 1)
       {
          ((ConstructorCalledByConstructorInvocation) invocation).setArguments(arguments);
       }
-      else if (invocation instanceof ConstructorCalledByMethodInvocation)
+      else if (invocation instanceof ConstructorCalledByMethodInvocation &&
+            // avoid constructors that receive an intance of Call enum
+            ((ConstructorCalledByMethodInvocation) invocation).getArguments().length == 1)
       {
          ((ConstructorCalledByMethodInvocation) invocation).setArguments(arguments);
       }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsPOJO.java	2007-02-05 13:57:42 UTC (rev 60290)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/args/ArgumentsPOJO.java	2007-02-05 13:58:11 UTC (rev 60291)
@@ -120,33 +120,36 @@
    
 }
 
-enum Call
+abstract class Call
 {
-   CONSTRUCTOR
+   public static final Call CONSTRUCTOR = new Call("CONSTRUCTOR")
    {
       public int perform(int arg)
       {
          CalledPOJO pojo = new CalledPOJO(arg);
          return pojo.arg;
       }
-   },
+   };
    
-   METHOD
+   public static final Call METHOD = new Call("METHOD")
    {
       public int perform(int arg)
       {
          CalledPOJO pojo = new CalledPOJO();
          return pojo.method(arg);
       }
-   },
+   };
    
-   STATIC_METHOD()
+   public static final Call STATIC_METHOD = new Call("STATIC_METHOD")
    {
       public int perform(int arg)
       {
          return CalledPOJO.staticMethod(arg);
       }
    };
+
+   // TODO replace by enum
+   private Call(String name) {}
    
    public abstract int perform(int arg);
 }