svn commit: r1432424 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/InterceptorBean.java test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java

[st...@apache.org]

Author: struberg
Date: Sat Jan 12 14:03:16 2013
New Revision: 1432424

URL: http://svn.apache.org/viewvc?rev=1432424&view=rev
Log:
OWB-344 fix AroundInvoke bug

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java?rev=1432424&r1=1432423&r2=1432424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InterceptorBean.java Sat Jan 12 14:03:16 2013
@@ -100,7 +100,7 @@ public abstract class InterceptorBean<T>
      */
     private Method[] postActivateMethods;
 
-    public void setAroundInvokeMethods(Method[] aroundInvokeMethod)
+    public void setAroundInvokeMethods(Method[] aroundInvokeMethods)
     {
         this.aroundInvokeMethods = aroundInvokeMethods;
     }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java?rev=1432424&r1=1432423&r2=1432424&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/resolution/InterceptorBeanBuilderTest.java Sat Jan 12 14:03:16 2013
@@ -25,6 +25,7 @@ import javax.enterprise.inject.spi.Inter
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.webbeans.component.InterceptorBean;
 import org.apache.webbeans.component.creation.CdiInterceptorBeanBuilder;
 import org.apache.webbeans.newtests.AbstractUnitTest;
 import org.apache.webbeans.newtests.interceptors.factory.beans.ClassInterceptedClass;
@@ -106,17 +107,23 @@ public class InterceptorBeanBuilderTest 
         CdiInterceptorBeanBuilder<TestInterceptor1> ibb
                 = new CdiInterceptorBeanBuilder<TestInterceptor1>(getWebBeansContext(), annotatedType);
         ibb.defineCdiInterceptorRules();
-        Interceptor<TestInterceptor1> bean = ibb.getBean();
+        InterceptorBean<TestInterceptor1> bean = ibb.getBean();
         Assert.assertNotNull(bean);
 
         Assert.assertTrue(bean.intercepts(InterceptionType.AROUND_INVOKE));
         Assert.assertTrue(bean.intercepts(InterceptionType.AROUND_TIMEOUT));
         Assert.assertTrue(bean.intercepts(InterceptionType.PRE_DESTROY));
         Assert.assertTrue(bean.intercepts(InterceptionType.POST_CONSTRUCT));
+
         Assert.assertFalse(bean.intercepts(InterceptionType.PRE_PASSIVATE));
         Assert.assertFalse(bean.intercepts(InterceptionType.POST_ACTIVATE));
         Assert.assertEquals(1, bean.getInterceptorBindings().size());
 
+        Assert.assertEquals(1, bean.getInterceptorMethods(InterceptionType.AROUND_INVOKE).length);
+        Assert.assertEquals(1, bean.getInterceptorMethods(InterceptionType.AROUND_TIMEOUT).length);
+        Assert.assertEquals(2, bean.getInterceptorMethods(InterceptionType.POST_CONSTRUCT).length);
+        Assert.assertEquals(2, bean.getInterceptorMethods(InterceptionType.PRE_DESTROY).length);
+
         shutDownContainer();
     }
 }