[jboss-cvs] JBossAS SVN: r71196 - 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]

Author: alesj
Date: 2008-03-24 07:37:40 -0400 (Mon, 24 Mar 2008)
New Revision: 71196

Modified:
   projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.xml
   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/BeanContainerUsageTestCase.java
Log:
Fix xml attribute names.

Modified: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.xml	2008-03-24 06:40:26 UTC (rev 71195)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.xml	2008-03-24 11:37:40 UTC (rev 71196)
@@ -6,19 +6,19 @@
 
    <beanfactory name="Bean1TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean1Type"/>
    <bean name="Bean1TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
-      <property name="factory"><inject name="Bean1TypeFactory"/></property>
+      <property name="factory"><inject bean="Bean1TypeFactory"/></property>
    </bean>
    <bean name="BeanContainer1Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
-      <property name="pool"><inject name="Bean1TypePool"/></property>
+      <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>
    </beanfactory>
    <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
-      <property name="factory"><inject name="Bean2TypeFactory"/></property>
+      <property name="factory"><inject bean="Bean2TypeFactory"/></property>
    </bean>
    <bean name="BeanContainer2Type" class="org.jboss.test.kernel.deployment.support.container.BeanContainer">
-      <property name="pool"><inject name="Bean2TypePool"/></property>
+      <property name="pool"><inject bean="Bean2TypePool"/></property>
    </bean>
 
 </deployment>

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-24 06:40:26 UTC (rev 71195)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanPool.java	2008-03-24 11:37:40 UTC (rev 71196)
@@ -34,7 +34,7 @@
 public class BeanPool<T>
 {
    /** The pooling policy */
-   private ArrayBlockingQueue<T> pool;
+   private ArrayBlockingQueue<T> pool = new ArrayBlockingQueue<T>(2);
    private BeanFactory factory;
    
    public BeanFactory getFactory()
@@ -54,7 +54,7 @@
       if(pool.size() == 0)
       {
          // Fill the pool
-         for(int n = 0; n < pool.size(); n ++)
+         for(int n = 0; n < pool.remainingCapacity(); n ++)
          {
             T bean = (T) factory.createBean();
             pool.put(bean);

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-24 06:40:26 UTC (rev 71195)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java	2008-03-24 11:37:40 UTC (rev 71196)
@@ -22,17 +22,14 @@
 package org.jboss.test.kernel.deployment.test;
 
 import junit.framework.Test;
-import org.jboss.beans.metadata.spi.factory.BeanFactory;
-import org.jboss.test.kernel.deployment.support.SimpleBeanWithLifecycle;
 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;
 
 /**
- * GenericBeanFactory lifecycle Test Case.
+ * Bean Container Test Case.
  * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 61978 $
+ * @author <a href="scott.stark at jboss.com">Scott Stark</a>
  */
 public class BeanContainerUsageTestCase extends AbstractDeploymentTest
 {
@@ -46,6 +43,7 @@
       super(name);
    }
 
+   @SuppressWarnings("unchecked")
    public void testDependencyInjectionOfBean() throws Throwable
    {
       BeanContainer<Bean1Type> container1 = (BeanContainer<Bean1Type>) getBean("BeanContainer1Type");