openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r892892 - in /incubator/openwebbeans/trunk/webbeans-impl/src/test: java/org/apache/webbeans/newtests/interceptors/beans/ java/org/apache/webbeans/newtests/interceptors/business/tests/ resources/org/apache/webbeans/newtests/interceptors/busi...
Date Mon, 21 Dec 2009 17:31:33 GMT
Author: struberg
Date: Mon Dec 21 17:31:33 2009
New Revision: 892892

URL: http://svn.apache.org/viewvc?rev=892892&view=rev
Log:
OWB-206 demonstrate the blocker problem that proxies only get injected for the 1st injection
of a bean!

Added:
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
  (with props)
    incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
  (with props)
Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/RequestScopedBean.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/RequestScopedBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/RequestScopedBean.java?rev=892892&r1=892891&r2=892892&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/RequestScopedBean.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/beans/RequestScopedBean.java
Mon Dec 21 17:31:33 2009
@@ -9,6 +9,11 @@
 	private int i=0;
 	private @Inject ApplicationScopedBean myService;
 
+	/** we need this trick, since the injected beans itself are only proxies... */
+	public RequestScopedBean getInstance() {
+		return this;
+	}
+	
 	public int getI() {
 		return i;
 	}

Added: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java?rev=892892&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
(added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
Mon Dec 21 17:31:33 2009
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.webbeans.newtests.interceptors.business.tests;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import junit.framework.Assert;
+
+import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.newtests.AbstractUnitTest;
+import org.apache.webbeans.newtests.interceptors.beans.ApplicationScopedBean;
+import org.apache.webbeans.newtests.interceptors.beans.RequestScopedBean;
+import org.apache.webbeans.newtests.interceptors.common.TransactionInterceptor;
+import org.junit.Test;
+
+@SuppressWarnings("unchecked")
+public class DependingInterceptorTest extends AbstractUnitTest
+{
+    private static final String PACKAGE_NAME = DependingInterceptorTest.class.getPackage().getName();
+    
+    @Test
+    public void testDependingBeanInterceptor()
+    {
+        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);
+        beanClasses.add(RequestScopedBean.class);
+        
+        TransactionInterceptor.coount = 0;
+        
+        startContainer(beanClasses, beanXmls);       
+        
+        Set<Bean<?>> beans = getBeanManager().getBeans(RequestScopedBean.class);
+        Assert.assertNotNull(beans);        
+        Bean<RequestScopedBean> bean = (Bean<RequestScopedBean>)beans.iterator().next();
               
+        
+        CreationalContext<RequestScopedBean> ctx = getBeanManager().createCreationalContext(bean);
+        
+        Object reference1 = getBeanManager().getReference(bean, RequestScopedBean.class,
ctx);
+        Assert.assertNotNull(reference1);
+        
+        Assert.assertTrue(reference1 instanceof RequestScopedBean);
+
+        RequestScopedBean beanInstance1 = (RequestScopedBean)reference1;
+        
+        TransactionInterceptor.coount = 0;
+        
+        beanInstance1.getMyService().getJ();
+
+        RequestScopedBean realInstance1 = beanInstance1.getInstance();
+        
+        Assert.assertTrue(TransactionInterceptor.ECHO);
+        Assert.assertEquals(1, TransactionInterceptor.coount);
+
+        TransactionInterceptor.ECHO = false;
+
+        ContextFactory.destroyRequestContext(null);
+        ContextFactory.initRequestContext(null);      
+        
+        CreationalContext<RequestScopedBean> ctx2 = getBeanManager().createCreationalContext(bean);
+        Object reference2 = getBeanManager().getReference(bean, RequestScopedBean.class,
ctx2);
+        Assert.assertNotNull(reference2);
+        
+        Assert.assertTrue(reference2 instanceof RequestScopedBean);
+        
+        RequestScopedBean beanInstance2 = (RequestScopedBean)reference2;
+        beanInstance2.getMyService().getJ();;
+        RequestScopedBean realInstance2 = beanInstance2.getInstance();
+
+        Assert.assertTrue(TransactionInterceptor.ECHO);
+
+        Assert.assertEquals(2, TransactionInterceptor.coount);
+        
+        Assert.assertNotSame(realInstance1, realInstance2);
+        Assert.assertSame(realInstance1.getMyService(), realInstance2.getMyService());
+        
+        shutDownContainer();
+        
+    }
+}

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml?rev=892892&view=auto
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
(added)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
Mon Dec 21 17:31:33 2009
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans>
+   <interceptors>
+            <class>org.apache.webbeans.newtests.interceptors.common.TransactionInterceptor</class>
+      <class>org.apache.webbeans.newtests.interceptors.common.SecureInterceptor</class>
+
+   </interceptors>
+</beans>

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/newtests/interceptors/business/tests/DependingInterceptorTest.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message