[Jboss-cvs] JBossAS SVN: r56500 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 1 07:31:24 EDT 2006
Author: alesj
Date: 2006-09-01 07:30:52 -0400 (Fri, 01 Sep 2006)
New Revision: 56500
Modified:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayXMLTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java
Log:
Added instantiation of BeanMetaData from Controller.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/AbstractKernelConfigTest.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -31,8 +31,11 @@
import org.jboss.joinpoint.spi.TargettedJoinpoint;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.test.kernel.AbstractKernelTest;
import org.jboss.test.kernel.config.support.XMLUtil;
+import org.jboss.dependency.spi.ControllerMode;
/**
* An abstract kernel config test.
@@ -55,7 +58,7 @@
super(name);
this.xmltest = xmltest;
}
-
+
protected Kernel bootstrap() throws Throwable
{
if (xmltest)
@@ -81,7 +84,6 @@
KernelConfigurator configurator = kernel.getConfigurator();
return instantiateAndConfigure(configurator, metaData);
}
-
protected Object instantiateAndConfigure(KernelConfigurator configurator, BeanMetaData metaData) throws Throwable
{
@@ -89,19 +91,26 @@
configure(configurator, result, metaData);
return result;
}
-
+
+ protected Object instantiate(KernelController controller, BeanMetaData metaData) throws Throwable
+ {
+ metaData.setMode(ControllerMode.AUTOMATIC);
+ KernelControllerContext kernelControllerContext = controller.install(metaData);
+ return kernelControllerContext.getTarget();
+ }
+
protected Object instantiate(KernelConfigurator configurator, BeanMetaData metaData) throws Throwable
{
Joinpoint joinPoint = configurator.getConstructorJoinPoint(metaData);
return joinPoint.dispatch();
}
-
+
protected void configure(KernelConfigurator configurator, Object bean, BeanMetaData metaData) throws Throwable
{
BeanInfo info = configurator.getBeanInfo(metaData);
configure(configurator, bean, info, metaData);
}
-
+
protected void configure(KernelConfigurator configurator, Object bean, BeanInfo info, BeanMetaData metaData) throws Throwable
{
Set joinPoints = configurator.getPropertySetterJoinPoints(info, metaData);
@@ -112,7 +121,7 @@
joinPoint.dispatch();
}
}
-
+
protected void configure(KernelConfigurator configurator, Object bean, BeanInfo info, PropertyMetaData metaData) throws Throwable
{
ClassLoader cl = getClass().getClassLoader();
@@ -120,7 +129,7 @@
joinPoint.setTarget(bean);
joinPoint.dispatch();
}
-
+
protected void unconfigure(KernelConfigurator configurator, Object bean, BeanInfo info, BeanMetaData metaData) throws Throwable
{
Set joinPoints = configurator.getPropertyNullerJoinPoints(info, metaData);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -23,19 +23,16 @@
import java.util.HashSet;
-import junit.framework.Test;
-
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
+import org.jboss.beans.metadata.plugins.*;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.config.support.MyObject;
import org.jboss.test.kernel.config.support.SimpleBean;
+import junit.framework.Test;
+
/**
* Array Test Case.
*
@@ -152,7 +149,7 @@
public void testArrayPreinstantiated() throws Throwable
{
- SimpleBean bean = customArrayExplicit();
+ SimpleBean bean = customArrayPreinstantiated();
assertNotNull(bean);
Object[] result = bean.getPreInstantiatedArray();
@@ -162,11 +159,38 @@
assertEquals(expected, result);
}
+ protected SimpleBean customArrayPreinstantiated() throws Throwable
+ {
+ Kernel kernel = bootstrap();
+ KernelController controller = kernel.getController();
+
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("test1", SimpleBean.class.getName());
+ HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
+ bmd.setProperties(properties);
+
+ StringValueMetaData vmd1 = new StringValueMetaData(string1);
+ StringValueMetaData vmd2 = new StringValueMetaData(string2);
+ StringValueMetaData vmd3 = new StringValueMetaData(string1);
+
+ AbstractArrayMetaData smd = new AbstractArrayMetaData();
+ smd.setType(new String[0].getClass().getName());
+ smd.setElementType("java.lang.String");
+ smd.add(vmd1);
+ smd.add(vmd2);
+ smd.add(vmd2); // tests duplicates
+ smd.add(vmd3); // tests duplicates
+
+ AbstractPropertyMetaData pmd = new AbstractPropertyMetaData("array", smd);
+ properties.add(pmd);
+
+ return (SimpleBean) instantiate(controller, bmd);
+ }
+
protected SimpleBean customArrayExplicit() throws Throwable
{
Kernel kernel = bootstrap();
KernelConfigurator configurator = kernel.getConfigurator();
-
+
AbstractBeanMetaData bmd = new AbstractBeanMetaData(SimpleBean.class.getName());
HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
bmd.setProperties(properties);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayXMLTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayXMLTestCase.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayXMLTestCase.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -21,11 +21,11 @@
*/
package org.jboss.test.kernel.config.test;
-import junit.framework.Test;
-
import org.jboss.test.kernel.config.support.SimpleBean;
import org.jboss.test.kernel.config.support.XMLUtil;
+import junit.framework.Test;
+
/**
* Array Test Case.
*
@@ -56,6 +56,12 @@
return (SimpleBean) util.getBean("SimpleBean");
}
+ protected SimpleBean customArrayPreinstantiated() throws Throwable
+ {
+ XMLUtil util = bootstrapXML(true);
+ return (SimpleBean) util.getBean("SimpleBean");
+ }
+
protected SimpleBean customArrayExplicit() throws Throwable
{
XMLUtil util = bootstrapXML(true);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -29,6 +29,7 @@
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.config.support.CustomCollection;
import org.jboss.test.kernel.config.support.MyObject;
import org.jboss.test.kernel.config.support.SimpleBean;
@@ -254,9 +255,9 @@
protected SimpleBean customCollectionPreInstantiated() throws Throwable
{
Kernel kernel = bootstrap();
- KernelConfigurator configurator = kernel.getConfigurator();
-
- AbstractBeanMetaData bmd = new AbstractBeanMetaData(SimpleBean.class.getName());
+ KernelController controller = kernel.getController();
+
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("test1", SimpleBean.class.getName());
HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
bmd.setProperties(properties);
@@ -266,7 +267,6 @@
AbstractCollectionMetaData smd = new AbstractCollectionMetaData();
smd.setElementType("java.lang.String");
- smd.setConfigurator(configurator);
smd.add(vmd1);
smd.add(vmd2);
smd.add(vmd2); // tests duplicates
@@ -275,7 +275,7 @@
AbstractPropertyMetaData pmd = new AbstractPropertyMetaData("preInstantiatedCollection", smd);
properties.add(pmd);
- return (SimpleBean) instantiateAndConfigure(configurator, bmd);
+ return (SimpleBean) instantiate(controller, bmd);
}
public void testCollectionWithValueTypeOverride() throws Throwable
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ListTestCase.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -22,23 +22,20 @@
package org.jboss.test.kernel.config.test;
import java.util.ArrayList;
-import java.util.List;
import java.util.HashSet;
+import java.util.List;
-import junit.framework.Test;
-
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractListMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
+import org.jboss.beans.metadata.plugins.*;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.config.support.CustomList;
import org.jboss.test.kernel.config.support.MyObject;
import org.jboss.test.kernel.config.support.SimpleBean;
+import junit.framework.Test;
+
/**
* List Test Case.
*
@@ -258,9 +255,9 @@
protected SimpleBean customListPreInstantiated() throws Throwable
{
Kernel kernel = bootstrap();
- KernelConfigurator configurator = kernel.getConfigurator();
-
- AbstractBeanMetaData bmd = new AbstractBeanMetaData(SimpleBean.class.getName());
+ KernelController controller = kernel.getController();
+
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("test1", SimpleBean.class.getName());
HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
bmd.setProperties(properties);
@@ -270,7 +267,6 @@
AbstractListMetaData smd = new AbstractListMetaData();
smd.setElementType("java.lang.String");
- smd.setConfigurator(configurator);
smd.add(vmd1);
smd.add(vmd2);
smd.add(vmd2); // tests duplicates
@@ -279,7 +275,7 @@
AbstractPropertyMetaData pmd = new AbstractPropertyMetaData("preInstantiatedList", smd);
properties.add(pmd);
- return (SimpleBean) instantiateAndConfigure(configurator, bmd);
+ return (SimpleBean) instantiate(controller, bmd);
}
public void testListWithValueTypeOverride() throws Throwable
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -25,20 +25,17 @@
import java.util.HashSet;
import java.util.Map;
-import junit.framework.Test;
-
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
+import org.jboss.beans.metadata.plugins.*;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.config.support.CustomMap;
import org.jboss.test.kernel.config.support.MyObject;
import org.jboss.test.kernel.config.support.SimpleBean;
+import junit.framework.Test;
+
/**
* Map Test Case.
*
@@ -121,7 +118,7 @@
{
Kernel kernel = bootstrap();
KernelConfigurator configurator = kernel.getConfigurator();
-
+
AbstractBeanMetaData bmd = new AbstractBeanMetaData(SimpleBean.class.getName());
HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
bmd.setProperties(properties);
@@ -248,9 +245,9 @@
protected SimpleBean customMapPreInstantiated() throws Throwable
{
Kernel kernel = bootstrap();
- KernelConfigurator configurator = kernel.getConfigurator();
-
- AbstractBeanMetaData bmd = new AbstractBeanMetaData(SimpleBean.class.getName());
+ KernelController controller = kernel.getController();
+
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("test1", SimpleBean.class.getName());
HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
bmd.setProperties(properties);
@@ -262,14 +259,13 @@
AbstractMapMetaData smd = new AbstractMapMetaData();
smd.setKeyType("java.lang.String");
smd.setValueType("java.lang.String");
- smd.setConfigurator(configurator);
smd.put(kmd1, vmd1);
smd.put(kmd2, vmd2);
AbstractPropertyMetaData pmd = new AbstractPropertyMetaData("preInstantiatedMap", smd);
properties.add(pmd);
- return (SimpleBean) instantiateAndConfigure(configurator, bmd);
+ return (SimpleBean) instantiate(controller, bmd);
}
public void testMapWithKeyTypeOverride() throws Throwable
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java 2006-09-01 10:01:18 UTC (rev 56499)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/SetTestCase.java 2006-09-01 11:30:52 UTC (rev 56500)
@@ -21,23 +21,20 @@
*/
package org.jboss.test.kernel.config.test;
-import java.util.Set;
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.AbstractSetMetaData;
-import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
+import org.jboss.beans.metadata.plugins.*;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.kernel.config.support.CustomSet;
import org.jboss.test.kernel.config.support.MyObject;
import org.jboss.test.kernel.config.support.SimpleBean;
+import junit.framework.Test;
+
/**
* Set Test Case.
*
@@ -257,9 +254,9 @@
protected SimpleBean customSetPreInstantiated() throws Throwable
{
Kernel kernel = bootstrap();
- KernelConfigurator configurator = kernel.getConfigurator();
-
- AbstractBeanMetaData bmd = new AbstractBeanMetaData(SimpleBean.class.getName());
+ KernelController controller = kernel.getController();
+
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("test1", SimpleBean.class.getName());
HashSet<PropertyMetaData> properties = new HashSet<PropertyMetaData>();
bmd.setProperties(properties);
@@ -269,7 +266,6 @@
AbstractSetMetaData smd = new AbstractSetMetaData();
smd.setElementType("java.lang.String");
- smd.setConfigurator(configurator);
smd.add(vmd1);
smd.add(vmd2);
smd.add(vmd2); // tests duplicates
@@ -278,7 +274,7 @@
AbstractPropertyMetaData pmd = new AbstractPropertyMetaData("preInstantiatedSet", smd);
properties.add(pmd);
- return (SimpleBean) instantiateAndConfigure(configurator, bmd);
+ return (SimpleBean) instantiate(controller, bmd);
}
public void testSetWithValueTypeOverride() throws Throwable
More information about the jboss-cvs-commits
mailing list