svn commit: r1435425 - in /openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test: TestContext.java unittests/decorator/Decorator1Test.java

[ar...@apache.org]

Author: arne
Date: Sat Jan 19 00:17:42 2013
New Revision: 1435425

URL: http://svn.apache.org/viewvc?rev=1435425&view=rev
Log:
OWB-344: Fixed tests

Modified:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1435425&r1=1435424&r2=1435425&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Sat Jan 19 00:17:42 2013
@@ -40,6 +40,8 @@ import javax.enterprise.inject.spi.BeanM
 import javax.interceptor.Interceptor;
 
 import org.apache.webbeans.component.AbstractOwbBean;
+import org.apache.webbeans.component.CdiInterceptorBean;
+import org.apache.webbeans.component.DecoratorBean;
 import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.component.AbstractProducerBean;
 import org.apache.webbeans.component.ManagedBean;
@@ -311,7 +313,9 @@ public abstract class TestContext implem
         AnnotatedType annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz);
         CdiInterceptorBeanBuilder<T> ibb = new CdiInterceptorBeanBuilder<T>(webBeansContext, annotatedType);
         ibb.defineCdiInterceptorRules();
-        return ibb.getBean();
+        CdiInterceptorBean<T> bean = ibb.getBean();
+        webBeansContext.getInterceptorsManager().addCdiInterceptor(bean);
+        return bean;
     }
 
     /**
@@ -320,7 +324,6 @@ public abstract class TestContext implem
      * @param clazz decorator class
      * @return the new decorator
      */
-    @SuppressWarnings("unchecked")
     protected <T> AbstractOwbBean<T> defineDecorator(Class<T> clazz)
     {
 
@@ -331,7 +334,9 @@ public abstract class TestContext implem
             DecoratorBeanBuilder<T> dbb = new DecoratorBeanBuilder<T>(webBeansContext, annotatedType);
             dbb.defineDecoratorRules();
 
-            return dbb.getBean();
+            DecoratorBean<T> bean = dbb.getBean();
+            webBeansContext.getDecoratorsManager().addDecorator(bean);
+            return bean;
         }
 
         return null;

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java?rev=1435425&r1=1435424&r2=1435425&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java Sat Jan 19 00:17:42 2013
@@ -67,8 +67,8 @@ public class Decorator1Test extends Test
         initializeDecoratorType(ServiceDecorator.class);
         initializeDecoratorType(LargeTransactionDecorator.class);        
         
-        defineManagedBean(CheckWithCheckPayment.class);
         defineDecorator(ServiceDecorator.class);
+        defineManagedBean(CheckWithCheckPayment.class);
         AbstractOwbBean<ServiceImpl1> component = defineManagedBean(ServiceImpl1.class);
 
         WebBeansContext webBeansContext = WebBeansContext.getInstance();