You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/01/19 22:52:34 UTC
svn commit: r1435728 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/decorator/
main/java/org/apache/webbeans/intercept/ main/java/org/apache/webbeans/xml/
test/java/org/apache/webbeans/newtests/ test/java/org/apache/webbeans/...
Author: struberg
Date: Sat Jan 19 21:52:33 2013
New Revision: 1435728
URL: http://svn.apache.org/viewvc?rev=1435728&view=rev
Log:
OWB-344 imporove interceptor and decorator support in unit tests
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
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/intercept/webbeans/ShoppingCardInterceptorTest.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java?rev=1435728&r1=1435727&r2=1435728&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java Sat Jan 19 21:52:33 2013
@@ -58,7 +58,7 @@ public class DecoratorsManager
this.webBeansContext = webBeansContext;
}
- public void addNewDecorator(Class<?> decoratorClazz)
+ public void addEnabledDecorator(Class<?> decoratorClazz)
{
Asserts.assertNotNull(decoratorClazz, "decoratorClazz parameter can not be emtpy");
if (!enabledDecorators.contains(decoratorClazz))
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1435728&r1=1435727&r2=1435728&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Sat Jan 19 21:52:33 2013
@@ -98,7 +98,7 @@ public class InterceptorsManager
/**
* Add a certain class to the enabled interceptors list.
*/
- public void addNewInterceptorClass(Class<?> interceptorClazz)
+ public void addEnabledInterceptorClass(Class<?> interceptorClazz)
{
Asserts.nullCheckForClass(interceptorClazz, "interceptorClazz can not be null");
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=1435728&r1=1435727&r2=1435728&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Sat Jan 19 21:52:33 2013
@@ -318,7 +318,7 @@ public final class WebBeansXMLConfigurat
}
else
{
- manager.addNewInterceptorClass(clazz);
+ manager.addEnabledInterceptorClass(clazz);
}
}
@@ -364,7 +364,7 @@ public final class WebBeansXMLConfigurat
child.getTextContent().trim() + " is already defined");
}
- manager.addNewDecorator(clazz);
+ manager.addEnabledDecorator(clazz);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java?rev=1435728&r1=1435727&r2=1435728&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java Sat Jan 19 21:52:33 2013
@@ -36,13 +36,17 @@ import org.apache.webbeans.lifecycle.tes
import org.apache.webbeans.lifecycle.test.OpenWebBeansTestMetaDataDiscoveryService;
import org.apache.webbeans.spi.ContainerLifecycle;
import org.apache.webbeans.util.WebBeansUtil;
+
import org.junit.Assert;
+import org.junit.Before;
public abstract class AbstractUnitTest
{
private OpenWebBeansTestLifeCycle testLifecycle;
private List<Extension> extensions = new ArrayList<Extension>();
+ private List<Class<?>> interceptors = new ArrayList<Class<?>>();
+ private List<Class<?>> decorators = new ArrayList<Class<?>>();
private WebBeansContext webBeansContext;
protected AbstractUnitTest()
@@ -50,6 +54,14 @@ public abstract class AbstractUnitTest
}
+ @Before
+ public void cleanup()
+ {
+ extensions.clear();
+ interceptors.clear();
+ decorators.clear();
+ }
+
protected void startContainer(Class<?>... beanClasses)
{
startContainer(Arrays.asList(beanClasses), null);
@@ -72,6 +84,24 @@ public abstract class AbstractUnitTest
webBeansContext.getExtensionLoader().addExtension(ext);
}
+ for (Class interceptor : interceptors)
+ {
+ // add it as enabled interceptor class, like it would be listed in beans.xml
+ webBeansContext.getInterceptorsManager().addEnabledInterceptorClass(interceptor);
+
+ // but also add it for scanning
+ beanClasses.add(interceptor);
+ }
+
+ for (Class decorator : decorators)
+ {
+ // add it as enabled decorator class, like it would be listed in beans.xml
+ webBeansContext.getDecoratorsManager().addEnabledDecorator(decorator);
+
+ // but also add it for scanning
+ beanClasses.add(decorator);
+ }
+
//Deploy bean classes
OpenWebBeansTestMetaDataDiscoveryService discoveryService = (OpenWebBeansTestMetaDataDiscoveryService)webBeansContext.getScannerService();
discoveryService.deployClasses(beanClasses);
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=1435728&r1=1435727&r2=1435728&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 21:52:33 2013
@@ -309,7 +309,7 @@ public abstract class TestContext implem
WebBeansContext webBeansContext = WebBeansContext.getInstance();
webBeansContext.getWebBeansUtil().checkManagedBeanCondition(clazz);
- webBeansContext.getInterceptorsManager().addNewInterceptorClass(clazz);
+ webBeansContext.getInterceptorsManager().addEnabledInterceptorClass(clazz);
AnnotatedType annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz);
CdiInterceptorBeanBuilder<T> ibb = new CdiInterceptorBeanBuilder<T>(webBeansContext, annotatedType);
ibb.defineCdiInterceptorRules();
@@ -445,7 +445,7 @@ public abstract class TestContext implem
*/
protected void initializeInterceptorType(Class<?> interceptorClazz)
{
- WebBeansContext.getInstance().getInterceptorsManager().addNewInterceptorClass(interceptorClazz);
+ WebBeansContext.getInstance().getInterceptorsManager().addEnabledInterceptorClass(interceptorClazz);
}
@@ -456,7 +456,7 @@ public abstract class TestContext implem
*/
protected void initializeDecoratorType(Class<?> decoratorClazz)
{
- WebBeansContext.getInstance().getDecoratorsManager().addNewDecorator(decoratorClazz);
+ WebBeansContext.getInstance().getDecoratorsManager().addEnabledDecorator(decoratorClazz);
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=1435728&r1=1435727&r2=1435728&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Sat Jan 19 21:52:33 2013
@@ -53,7 +53,7 @@ public class ShoppingCardInterceptorTest
webBeansContext.getContextFactory().initSessionContext(null);
// Interceptors must explicitly get enabled via XML. We fake this:
- webBeansContext.getInterceptorsManager().addNewInterceptorClass(TransactionalInterceptor.class);
+ webBeansContext.getInterceptorsManager().addEnabledInterceptorClass(TransactionalInterceptor.class);
defineInterceptor(TransactionalInterceptor.class);