[jboss-cvs] JBossAS SVN: r71333 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/deployment/support/container and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 27 01:06:36 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-03-27 01:06:34 -0400 (Thu, 27 Mar 2008)
New Revision: 71333
Added:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml
Modified:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/Bean1Type.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
Log:
Add tests of bean creation with pool exhaustion
Modified: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml 2008-03-27 04:48:41 UTC (rev 71332)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml 2008-03-27 05:06:34 UTC (rev 71333)
@@ -12,7 +12,7 @@
<property name="pool"><inject bean="Bean1TypePool"/></property>
</bean>
<beanfactory name="Bean2TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean2Type">
- <property name="bean1"><value-factory bean="Bean1TypeFactory" method="createBean" /></property>
+ <property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
</beanfactory>
<bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
<property name="factory"><inject bean="Bean2TypeFactory"/></property>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml 2008-03-27 05:06:34 UTC (rev 71333)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+
+ <beanfactory name="Bean1TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean1Type"/>
+ <bean name="Bean1TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <constructor>
+ <parameter>3</parameter>
+ </constructor>
+ <property name="factory"><inject bean="Bean1TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer1Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean1TypePool"/></property>
+ </bean>
+ <beanfactory name="Bean2TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean2Type">
+ <property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
+ </beanfactory>
+ <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <constructor>
+ <parameter>4</parameter>
+ </constructor>
+ <property name="factory"><inject bean="Bean2TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer2Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean2TypePool"/></property>
+ </bean>
+
+</deployment>
Property changes on: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBeanWithMismatchedPoolSizes.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/Bean1Type.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/Bean1Type.java 2008-03-27 04:48:41 UTC (rev 71332)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/Bean1Type.java 2008-03-27 05:06:34 UTC (rev 71333)
@@ -21,14 +21,22 @@
*/
package org.jboss.test.kernel.deployment.support.container;
+import org.jboss.logging.Logger;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
public class Bean1Type
{
+ private static Logger log = Logger.getLogger(Bean1Type.class);
private String prop1;
+ public Bean1Type()
+ {
+ log.debug("Bean1Type.ctor, this="+this);
+ }
+
public String getProp1()
{
return prop1;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java 2008-03-27 04:48:41 UTC (rev 71332)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java 2008-03-27 05:06:34 UTC (rev 71333)
@@ -22,8 +22,10 @@
package org.jboss.test.kernel.deployment.support.container;
import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.TimeUnit;
import org.jboss.beans.metadata.spi.factory.BeanFactory;
+import org.jboss.logging.Logger;
/**
*
@@ -33,10 +35,21 @@
*/
public class BeanPool<T>
{
+ private Logger log;
/** The pooling policy */
- private ArrayBlockingQueue<T> pool = new ArrayBlockingQueue<T>(2);
+ private ArrayBlockingQueue<T> pool;
+ private boolean poolInitialized = false;
private BeanFactory factory;
-
+
+ public BeanPool()
+ {
+ this(3);
+ }
+ public BeanPool(int capacity)
+ {
+ pool = new ArrayBlockingQueue<T>(capacity);
+ }
+
public BeanFactory getFactory()
{
return factory;
@@ -47,21 +60,39 @@
this.factory = factory;
}
+ public int size()
+ {
+ return pool.size();
+ }
+ public int remainingCapacity()
+ {
+ return pool.remainingCapacity();
+ }
+
@SuppressWarnings("unchecked")
public synchronized T createBean()
throws Throwable
{
- if(pool.size() == 0)
+ if(poolInitialized == false)
{
+ T bean = (T) factory.createBean();
+ pool.put(bean);
+ log = Logger.getLogger("BeanPool<"+bean.getClass().getSimpleName()+">");
+ log.debug("createBean, initializing pool, remainingCapacity: "+pool.remainingCapacity());
int capacity = pool.remainingCapacity();
// Fill the pool
for(int n = 0; n < capacity; n ++)
{
- T bean = (T) factory.createBean();
+ bean = (T) factory.createBean();
pool.put(bean);
}
+ poolInitialized = true;
}
- return pool.take();
+ T bean = pool.poll(1, TimeUnit.SECONDS);
+ if(bean == null)
+ throw new IllegalStateException(this+" is emtpy");
+ log.debug("End createBean, size: "+pool.size()+", bean: "+bean);
+ return bean;
}
public void destroyBean(T bean)
throws Throwable
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-03-27 04:48:41 UTC (rev 71332)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-03-27 05:06:34 UTC (rev 71333)
@@ -23,15 +23,19 @@
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueFactoryMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
@@ -64,7 +68,7 @@
<property name="pool"><inject bean="Bean1TypePool"/></property>
</bean>
<beanfactory name="Bean2TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean2Type">
- <property name="bean1"><value-factory bean="Bean1TypeFactory" method="createBean" /></property>
+ <property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
</beanfactory>
<bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
<property name="factory"><inject bean="Bean2TypeFactory"/></property>
@@ -103,7 +107,7 @@
GenericBeanFactoryMetaData Bean2TypeFactory = new GenericBeanFactoryMetaData("Bean2TypeFactory",
"org.jboss.test.kernel.deployment.support.container.Bean2Type");
Set<PropertyMetaData> Bean2TypeFactory_propertys = new HashSet<PropertyMetaData>();
- AbstractValueFactoryMetaData bean1CreateMethod = new AbstractValueFactoryMetaData("Bean1TypeFactory", "createBean");
+ AbstractValueFactoryMetaData bean1CreateMethod = new AbstractValueFactoryMetaData("Bean1TypePool", "createBean");
Bean2TypeFactory_propertys.add(new AbstractPropertyMetaData("bean1", bean1CreateMethod));
Bean2TypeFactory.setProperties(Bean2TypeFactory_propertys);
beanFactories.add(Bean2TypeFactory);
@@ -128,4 +132,58 @@
return deployment;
}
+ /*
+ <beanfactory name="Bean1TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean1Type"/>
+ <bean name="Bean1TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <constructor>
+ <parameter>3</parameter>
+ </constructor>
+ <property name="factory"><inject bean="Bean1TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer1Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean1TypePool"/></property>
+ </bean>
+ <beanfactory name="Bean2TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean2Type">
+ <property name="bean1"><value-factory bean="Bean1TypePool" method="createBean" /></property>
+ </beanfactory>
+ <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <constructor>
+ <parameter>4</parameter>
+ </constructor>
+ <property name="factory"><inject bean="Bean2TypeFactory"/></property>
+ </bean>
+ <bean name="BeanContainer2Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
+ <property name="pool"><inject bean="Bean2TypePool"/></property>
+ </bean>
+ */
+ protected KernelDeployment getDeploymentForDependencyInjectionOfBeanWithMismatchedPoolSizes()
+ {
+ KernelDeployment deployment = getDeploymentForDependencyInjectionOfBean();
+ // Update the pool ctors
+ List<BeanMetaDataFactory> beanFactories = deployment.getBeanFactories();
+ for(BeanMetaDataFactory bmdf : beanFactories)
+ {
+ if(bmdf instanceof AbstractBeanMetaData)
+ {
+ AbstractBeanMetaData abmd = (AbstractBeanMetaData) bmdf;
+ if(abmd.getName().equals("Bean1TypePool"))
+ {
+ AbstractConstructorMetaData ctor = new AbstractConstructorMetaData();
+ ArrayList<ParameterMetaData> params = new ArrayList<ParameterMetaData>();
+ params.add(new AbstractParameterMetaData(int.class.getName(), "3"));
+ ctor.setParameters(params);
+ abmd.setConstructor(ctor);
+ }
+ else if(abmd.getName().equals("Bean2TypePool"))
+ {
+ AbstractConstructorMetaData ctor = new AbstractConstructorMetaData();
+ ArrayList<ParameterMetaData> params = new ArrayList<ParameterMetaData>();
+ params.add(new AbstractParameterMetaData(int.class.getName(), "4"));
+ ctor.setParameters(params);
+ abmd.setConstructor(ctor);
+ }
+ }
+ }
+ return deployment;
+ }
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-03-27 04:48:41 UTC (rev 71332)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-03-27 05:06:34 UTC (rev 71333)
@@ -23,6 +23,7 @@
import java.lang.reflect.Method;
import java.net.URL;
+import java.util.ArrayList;
import junit.framework.Test;
@@ -33,22 +34,22 @@
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.test.AbstractTestDelegate;
import org.jboss.test.kernel.AbstractKernelTest;
-import org.jboss.test.kernel.config.support.XMLUtil;
import org.jboss.test.kernel.deployment.support.container.Bean1Type;
import org.jboss.test.kernel.deployment.support.container.Bean2Type;
import org.jboss.test.kernel.deployment.support.container.BeanContainer;
+import org.jboss.test.kernel.deployment.support.container.BeanPool;
/**
* Bean Container Test Case.
*
* @author <a href="scott.stark at jboss.com">Scott Stark</a>
- * @version $Revision:$
+ * @version $Revision$
*/
public class BeanContainerUsageTestCase extends AbstractKernelTest
{
private Kernel kernel;
+ private BasicXMLDeployer deployer;
public static Test suite()
{
@@ -65,18 +66,48 @@
{
bootstrap();
BeanContainer<Bean1Type> container1 = (BeanContainer<Bean1Type>) getBean("BeanContainer1Type");
+ BeanPool<Bean1Type> pool1 = (BeanPool<Bean1Type>) getBean("Bean1TypePool");
BeanContainer<Bean2Type> container2 = (BeanContainer<Bean2Type>) getBean("BeanContainer2Type");
Bean2Type bean21 = container2.getBean();
+ getLog().debug("bean21: "+bean21);
Bean1Type bean11 = bean21.getBean1();
+ assertEquals(0, pool1.size());
+ getLog().debug("bean11: "+bean11);
assertNotNull(bean11);
// Create another Bean2Type instance
Bean2Type bean22 = container2.getBean();
+ getLog().debug("bean22: "+bean22);
assertTrue(bean22 != bean21);
// The injected bean should not be the same as injected into bean21
Bean1Type bean12 = bean22.getBean1();
+ getLog().debug("bean12: "+bean12);
assertNotNull(bean12);
assertTrue(bean12 != bean11);
+
+ // Create another bean 2 type, should fail
+ Bean2Type bean23 = container2.getBean();
+ getLog().debug("bean23: "+bean23);
+ Bean1Type bean13Injected = bean23.getBean1();
+ getLog().debug("bean13Injected: "+bean13Injected);
+ assertNotNull(bean13Injected);
+ deployer.shutdown();
}
+ public void testDependencyInjectionOfBeanWithMismatchedPoolSizes()
+ throws Throwable
+ {
+ bootstrap();
+ BeanContainer<Bean2Type> container2 = (BeanContainer<Bean2Type>) getBean("BeanContainer2Type");
+ try
+ {
+ Bean2Type bean21 = container2.getBean();
+ fail("Should not have been able to create a Bean2Type");
+ }
+ catch(IllegalStateException e)
+ {
+ getLog().info("Saw expected IllegalStateException");
+ }
+ deployer.shutdown();
+ }
protected KernelDeployment getDeploymentForDependencyInjectionOfBean()
{
@@ -91,10 +122,19 @@
protected Kernel bootstrap() throws Throwable
{
kernel = super.bootstrap();
- BasicXMLDeployer deployer = new BasicXMLDeployer(kernel, ControllerMode.AUTOMATIC);
+ deployer = new BasicXMLDeployer(kernel, ControllerMode.AUTOMATIC);
String testName = "getDeploymentFor"+ getName().substring(4);
- Method getDeployment = getClass().getDeclaredMethod(testName, null);
- KernelDeployment deployment = (KernelDeployment) getDeployment.invoke(this, null);
+ KernelDeployment deployment = null;
+ try
+ {
+ Method getDeployment = getClass().getDeclaredMethod(testName, null);
+ deployment = (KernelDeployment) getDeployment.invoke(this, null);
+ }
+ catch(NoSuchMethodException e)
+ {
+ getLog().debug("Ignoring: "+e);
+ }
+
if(deployment == null)
{
String xmlName = getClass().getName() + "_" + super.getName();
Property changes on: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
More information about the jboss-cvs-commits
mailing list