[jboss-cvs] JBossAS SVN: r71318 - in projects/microcontainer/trunk/kernel/src: tests/org/jboss/test/kernel/deployment/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 26 16:42:24 EDT 2008
Author: scott.stark at jboss.org
Date: 2008-03-26 16:42:24 -0400 (Wed, 26 Mar 2008)
New Revision: 71318
Added:
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/test/BeanContainerUsageMDTestCase.java
Removed:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.xml
Modified:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
Log:
Add the programatic version of the bean container usage test
Deleted: 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-26 20:38:15 UTC (rev 71317)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.xml 2008-03-26 20:42:24 UTC (rev 71318)
@@ -1,24 +0,0 @@
-<?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">
- <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="Bean1TypeFactory" method="createBean" /></property>
- </beanfactory>
- <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
- <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>
Copied: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml (from rev 71280, 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_testDependencyInjectionOfBean.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase_testDependencyInjectionOfBean.xml 2008-03-26 20:42:24 UTC (rev 71318)
@@ -0,0 +1,24 @@
+<?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">
+ <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="Bean1TypeFactory" method="createBean" /></property>
+ </beanfactory>
+ <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <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>
Added: 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 (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java 2008-03-26 20:42:24 UTC (rev 71318)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.kernel.deployment.test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
+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.PropertyMetaData;
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+
+/**
+ * Programatic version of the BeanContainerUsageTestCase tests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class BeanContainerUsageMDTestCase extends BeanContainerUsageTestCase
+{
+ public static Test suite()
+ {
+ return suite(BeanContainerUsageMDTestCase.class);
+ }
+
+ public BeanContainerUsageMDTestCase(String name)
+ {
+ super(name);
+ }
+
+ /*
+ <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 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="Bean1TypeFactory" method="createBean" /></property>
+ </beanfactory>
+ <bean name="Bean2TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">
+ <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 getDeploymentForDependencyInjectionOfBean()
+ {
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("DependencyInjectionOfBean");
+ ArrayList<BeanMetaDataFactory> beanFactories = new ArrayList<BeanMetaDataFactory>();
+ // Bean1TypeFactory
+ GenericBeanFactoryMetaData Bean1TypeFactory = new GenericBeanFactoryMetaData("Bean1TypeFactory",
+ "org.jboss.test.kernel.deployment.support.container.Bean1Type");
+ beanFactories.add(Bean1TypeFactory);
+ // Bean1TypePool
+ AbstractBeanMetaData Bean1TypePool = new AbstractBeanMetaData("Bean1TypePool",
+ "org.jboss.test.kernel.deployment.support.container.BeanPool");
+ Set<PropertyMetaData> Bean1TypePool_propertys = new HashSet<PropertyMetaData>();
+ Bean1TypePool_propertys.add(new AbstractPropertyMetaData("factory",
+ new AbstractDependencyValueMetaData("Bean1TypeFactory")));
+ Bean1TypePool.setProperties(Bean1TypePool_propertys);
+ beanFactories.add(Bean1TypePool);
+ // BeanContainer1Type
+ AbstractBeanMetaData BeanContainer1Type = new AbstractBeanMetaData("BeanContainer1Type",
+ "org.jboss.test.kernel.deployment.support.container.BeanContainer");
+ Set<PropertyMetaData> BeanContainer1Type_propertys = new HashSet<PropertyMetaData>();
+ BeanContainer1Type_propertys.add(new AbstractPropertyMetaData("pool",
+ new AbstractDependencyValueMetaData("Bean1TypePool")));
+ BeanContainer1Type.setProperties(BeanContainer1Type_propertys);
+ beanFactories.add(BeanContainer1Type);
+
+ // Bean2TypeFactory
+ 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");
+ Bean2TypeFactory_propertys.add(new AbstractPropertyMetaData("bean1", bean1CreateMethod));
+ Bean2TypeFactory.setProperties(Bean2TypeFactory_propertys);
+ beanFactories.add(Bean2TypeFactory);
+ // Bean2TypePool
+ AbstractBeanMetaData Bean2TypePool = new AbstractBeanMetaData("Bean2TypePool",
+ "org.jboss.test.kernel.deployment.support.container.BeanPool");
+ Set<PropertyMetaData> Bean2TypePool_propertys = new HashSet<PropertyMetaData>();
+ Bean2TypePool_propertys.add(new AbstractPropertyMetaData("factory",
+ new AbstractDependencyValueMetaData("Bean2TypeFactory")));
+ Bean2TypePool.setProperties(Bean2TypePool_propertys);
+ beanFactories.add(Bean2TypePool);
+ // BeanContainer2Type
+ AbstractBeanMetaData BeanContainer2Type = new AbstractBeanMetaData("BeanContainer2Type",
+ "org.jboss.test.kernel.deployment.support.container.BeanContainer");
+ Set<PropertyMetaData> BeanContainer2Type_propertys = new HashSet<PropertyMetaData>();
+ BeanContainer2Type_propertys.add(new AbstractPropertyMetaData("pool",
+ new AbstractDependencyValueMetaData("Bean2TypePool")));
+ BeanContainer2Type.setProperties(BeanContainer2Type_propertys);
+ beanFactories.add(BeanContainer2Type);
+
+ deployment.setBeanFactories(beanFactories);
+
+ return deployment;
+ }
+}
Property changes on: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
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-26 20:38:15 UTC (rev 71317)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java 2008-03-26 20:42:24 UTC (rev 71318)
@@ -21,7 +21,21 @@
*/
package org.jboss.test.kernel.deployment.test;
+import java.lang.reflect.Method;
+import java.net.URL;
+
import junit.framework.Test;
+
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+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;
@@ -30,15 +44,18 @@
* Bean Container Test Case.
*
* @author <a href="scott.stark at jboss.com">Scott Stark</a>
+ * @version $Revision:$
*/
-public class BeanContainerUsageTestCase extends AbstractDeploymentTest
+public class BeanContainerUsageTestCase extends AbstractKernelTest
{
+ private Kernel kernel;
+
public static Test suite()
{
return suite(BeanContainerUsageTestCase.class);
}
- public BeanContainerUsageTestCase(String name) throws Throwable
+ public BeanContainerUsageTestCase(String name)
{
super(name);
}
@@ -46,6 +63,7 @@
@SuppressWarnings("unchecked")
public void testDependencyInjectionOfBean() throws Throwable
{
+ bootstrap();
BeanContainer<Bean1Type> container1 = (BeanContainer<Bean1Type>) getBean("BeanContainer1Type");
BeanContainer<Bean2Type> container2 = (BeanContainer<Bean2Type>) getBean("BeanContainer2Type");
Bean2Type bean21 = container2.getBean();
@@ -60,4 +78,52 @@
assertTrue(bean12 != bean11);
}
-}
\ No newline at end of file
+ protected KernelDeployment getDeploymentForDependencyInjectionOfBean()
+ {
+ return null;
+ }
+
+ /**
+ * Either deploy a test specific xml descriptor, or obtain a test
+ * specific KernelDeployment by looking for a method
+ * "getDeploymentFor"+ getName().substring(4);
+ */
+ protected Kernel bootstrap() throws Throwable
+ {
+ kernel = super.bootstrap();
+ BasicXMLDeployer 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);
+ if(deployment == null)
+ {
+ String xmlName = getClass().getName() + "_" + super.getName();
+ xmlName = xmlName.replace('.', '/') + ".xml";
+ URL url = getClass().getClassLoader().getResource(xmlName);
+ if (url != null)
+ deployer.deploy(url);
+ else
+ getLog().debug("No test specific deployment " + xmlName);
+ }
+ else
+ {
+ deployer.deploy(deployment);
+ }
+ deployer.validate();
+ return kernel;
+ }
+ protected Object getBean(final Object name)
+ {
+ KernelControllerContext context = getControllerContext(name, ControllerState.INSTALLED);
+ return context.getTarget();
+ }
+ protected KernelControllerContext getControllerContext(final Object name, final ControllerState state)
+ {
+ KernelController controller = kernel.getController();
+ KernelControllerContext context = (KernelControllerContext) controller.getContext(name, state);
+ if (context == null)
+ throw new IllegalStateException("Bean not found " + name + " at state " + state);
+ return context;
+ }
+
+}
More information about the jboss-cvs-commits
mailing list