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 2010/03/17 21:30:36 UTC
svn commit: r924472 - in
/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors:
beans/ business/tests/ common/ dependent/
Author: struberg
Date: Wed Mar 17 20:30:35 2010
New Revision: 924472
URL: http://svn.apache.org/viewvc?rev=924472&view=rev
Log:
OWB-329 add test for @Dependent behaviour of interceptors
Modified:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/ApplicationScopedBean.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/TransactionInterceptor.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/ApplicationScopedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/ApplicationScopedBean.java?rev=924472&r1=924471&r2=924472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/ApplicationScopedBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/ApplicationScopedBean.java Wed Mar 17 20:30:35 2010
@@ -25,14 +25,14 @@ import org.apache.webbeans.test.componen
@ApplicationScoped
public class ApplicationScopedBean {
- private int j;
+ private int j;
- public int getJ() {
- return j;
- }
+ public int getJ() {
+ return j;
+ }
+
+ public void setJ(int j) {
+ this.j = j;
+ }
- public void setJ(int j) {
- this.j = j;
- }
-
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java?rev=924472&r1=924471&r2=924472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java Wed Mar 17 20:30:35 2010
@@ -46,7 +46,7 @@ public class DependingInterceptorTest ex
beanClasses.add(ApplicationScopedBean.class);
beanClasses.add(RequestScopedBean.class);
- TransactionInterceptor.coount = 0;
+ TransactionInterceptor.count = 0;
startContainer(beanClasses, beanXmls);
@@ -63,14 +63,14 @@ public class DependingInterceptorTest ex
RequestScopedBean beanInstance1 = (RequestScopedBean)reference1;
- TransactionInterceptor.coount = 0;
+ TransactionInterceptor.count = 0;
beanInstance1.getMyService().getJ();
RequestScopedBean realInstance1 = beanInstance1.getInstance();
Assert.assertTrue(TransactionInterceptor.ECHO);
- Assert.assertEquals(1, TransactionInterceptor.coount);
+ Assert.assertEquals(1, TransactionInterceptor.count);
TransactionInterceptor.ECHO = false;
@@ -89,7 +89,7 @@ public class DependingInterceptorTest ex
Assert.assertTrue(TransactionInterceptor.ECHO);
- Assert.assertEquals(2, TransactionInterceptor.coount);
+ Assert.assertEquals(2, TransactionInterceptor.count);
Assert.assertNotSame(realInstance1, realInstance2);
Assert.assertEquals(realInstance1.getMyService().getJ(), realInstance2.getMyService().getJ());
@@ -97,4 +97,40 @@ public class DependingInterceptorTest ex
shutDownContainer();
}
+
+ @Test
+ public void testInterceptorCreation() throws Exception
+ {
+ Collection<URL> beanXmls = new ArrayList<URL>();
+ beanXmls.add(getXMLUrl(PACKAGE_NAME, "DependingInterceptorTest"));
+
+ Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
+ beanClasses.add(TransactionInterceptor.class);
+ beanClasses.add(ApplicationScopedBean.class);
+
+ TransactionInterceptor.count = 0;
+ TransactionInterceptor.interceptorCount = 0;
+
+ startContainer(beanClasses, beanXmls);
+
+ Set<Bean<?>> beans = getBeanManager().getBeans(ApplicationScopedBean.class);
+ Assert.assertNotNull(beans);
+ Bean<ApplicationScopedBean> bean = (Bean<ApplicationScopedBean>)beans.iterator().next();
+
+ CreationalContext<ApplicationScopedBean> ctx = getBeanManager().createCreationalContext(bean);
+
+ Object reference1 = getBeanManager().getReference(bean, ApplicationScopedBean.class, ctx);
+ Assert.assertNotNull(reference1);
+
+ ApplicationScopedBean app = (ApplicationScopedBean) reference1;
+
+ app.getJ();
+ Assert.assertTrue(TransactionInterceptor.interceptorCount == 1);
+
+ app.getJ();
+ Assert.assertTrue(TransactionInterceptor.interceptorCount == 1);
+
+ app.getJ();
+ Assert.assertTrue(TransactionInterceptor.interceptorCount == 1);
+}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java?rev=924472&r1=924471&r2=924472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/WithInheritedBindingTypeTest.java Wed Mar 17 20:30:35 2010
@@ -46,7 +46,7 @@ public class WithInheritedBindingTypeTes
beanClasses.add(SecureInterceptor.class);
beanClasses.add(WithInheritedBindingTypeBean.class);
- TransactionInterceptor.coount = 0;
+ TransactionInterceptor.count = 0;
startContainer(beanClasses, beanXmls);
@@ -76,7 +76,7 @@ public class WithInheritedBindingTypeTes
beanInstance = (WithInheritedBindingTypeBean)reference;
beanInstance.business();
- Assert.assertEquals(2, TransactionInterceptor.coount);
+ Assert.assertEquals(2, TransactionInterceptor.count);
shutDownContainer();
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java?rev=924472&r1=924471&r2=924472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java Wed Mar 17 20:30:35 2010
@@ -28,6 +28,13 @@ public class DependentInterceptor
{
public static boolean DEP_OK = false;
+ public static int refCount = 0;
+
+ public DependentInterceptor()
+ {
+ refCount++;
+ }
+
public Object aroundInvoke(InvocationContext ctx) throws Exception
{
DEP_OK = true;
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/TransactionInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/TransactionInterceptor.java?rev=924472&r1=924471&r2=924472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/TransactionInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/TransactionInterceptor.java Wed Mar 17 20:30:35 2010
@@ -25,13 +25,21 @@ public class TransactionInterceptor
{
public static boolean ECHO = false;
- public static int coount = 0;
+ public static int count = 0;
+
+ /** this counts how many interceptor instances got created */
+ public static int interceptorCount = 0;
+
+ public TransactionInterceptor()
+ {
+ interceptorCount++;
+ }
@AroundInvoke
public Object invoke(InvocationContext context) throws Exception
{
ECHO = true;
- coount++;
+ count++;
return context.proceed();
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java?rev=924472&r1=924471&r2=924472&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java Wed Mar 17 20:30:35 2010
@@ -60,7 +60,9 @@ public class DependentInterceptorTest ex
Bean<DependentScopedBean> bean = (Bean<DependentScopedBean>)beans.iterator().next();
CreationalContext<DependentScopedBean> ctx = getBeanManager().createCreationalContext(bean);
-
+
+ DependentInterceptor.refCount = 0;
+
Object reference = getBeanManager().getReference(bean, DependentScopedBean.class, ctx);
Assert.assertNotNull(reference);
@@ -72,6 +74,7 @@ public class DependentInterceptorTest ex
DependentScopedBean dbean = (DependentScopedBean)reference;
dbean.sayHello();
+ //X TODO this should finally work! Assert.assertTrue(DependentInterceptor.refCount == 1);
Assert.assertTrue(DependentScopedBean.SAY_HELLO);