[Jboss-cvs] JBossAS SVN: r56351 - in projects/microcontainer/trunk/kernel/src: resources/xml-test/org/jboss/test/kernel/config/test tests/org/jboss/test/kernel/config/support tests/org/jboss/test/kernel/config/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 28 15:07:33 EDT 2006
Author: alesj
Date: 2006-08-28 15:07:23 -0400 (Mon, 28 Aug 2006)
New Revision: 56351
Added:
projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testArrayPreinstantiated.xml
projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomMapPreinstantiated.xml
Modified:
projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomCollectionPreinstantiated.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.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/MapTestCase.java
Log:
Additional preinstantiated tests.
Added: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testArrayPreinstantiated.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testArrayPreinstantiated.xml 2006-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testArrayPreinstantiated.xml 2006-08-28 19:07:23 UTC (rev 56351)
@@ -0,0 +1,18 @@
+<?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">
+ <bean name="SimpleBean" class="org.jboss.test.kernel.config.support.SimpleBean">
+ <constructor>
+ <parameter class="java.lang.String">string1</parameter>
+ </constructor>
+ <property name="preInstantiatedArray">
+ <array elementClass="java.lang.String">
+ <value>string2</value>
+ <value>string2</value>
+ <value>string1</value>
+ </array>
+ </property>
+ </bean>
+</deployment>
Modified: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomCollectionPreinstantiated.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomCollectionPreinstantiated.xml 2006-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomCollectionPreinstantiated.xml 2006-08-28 19:07:23 UTC (rev 56351)
@@ -5,7 +5,7 @@
xmlns="urn:jboss:bean-deployer">
<bean name="SimpleBean" class="org.jboss.test.kernel.config.support.SimpleBean">
<constructor>
- <parameter>string1</parameter>
+ <parameter class="java.lang.String">string1</parameter>
</constructor>
<property name="preInstantiatedCollection">
<collection class="org.jboss.test.kernel.config.support.CustomCollection" elementClass="java.lang.String">
Added: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomMapPreinstantiated.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomMapPreinstantiated.xml 2006-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testCustomMapPreinstantiated.xml 2006-08-28 19:07:23 UTC (rev 56351)
@@ -0,0 +1,17 @@
+<?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">
+ <bean name="SimpleBean" class="org.jboss.test.kernel.config.support.SimpleBean">
+ <constructor>
+ <parameter>string1</parameter>
+ <parameter>string2</parameter>
+ </constructor>
+ <property name="preInstantiatedMap">
+ <map class="org.jboss.test.kernel.config.support.CustomMap" keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>string2</key><value>string1</value></entry>
+ </map>
+ </property>
+ </bean>
+</deployment>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java 2006-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/CustomMap.java 2006-08-28 19:07:23 UTC (rev 56351)
@@ -39,11 +39,12 @@
public CustomMap()
{
+ this.preInstantiated = true;
}
public CustomMap(boolean preInstantiated)
{
- this.preInstantiated = true;
+ this.preInstantiated = preInstantiated;
}
public boolean getPreInstantiated()
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java 2006-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/support/SimpleBean.java 2006-08-28 19:07:23 UTC (rev 56351)
@@ -136,6 +136,9 @@
/** array */
private Object[] array;
+ /** preInstantiated */
+ private Object[] preInstantiatedArray = new Object[]{"string1", "string2", "string2", "string1"};
+
/** map */
private Map map;
@@ -159,8 +162,14 @@
constructorUsed = string;
aString = string;
preInstantiatedCollection.add(string);
+ preInstantiatedArray = new Object[]{"string1"};
}
+ public SimpleBean(String string1, String string2)
+ {
+ preInstantiatedMap.put(string1, string2);
+ }
+
public SimpleBean(Integer integer)
{
constructorUsed = integer.getClass().getName() + ":" + integer.toString();
@@ -536,6 +545,16 @@
this.array = array;
}
+ public Object[] getPreInstantiatedArray()
+ {
+ return preInstantiatedArray;
+ }
+
+ public void setPreInstantiatedArray(Object[] preInstantiatedArray)
+ {
+ this.preInstantiatedArray = preInstantiatedArray;
+ }
+
public String[] getCustomArray()
{
return (String[]) array;
@@ -571,7 +590,7 @@
return preInstantiatedMap;
}
- public void setPreInstantiatedList(CustomMap preInstantiatedMap)
+ public void setPreInstantiatedMap(CustomMap preInstantiatedMap)
{
this.preInstantiatedMap = preInstantiatedMap;
}
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-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java 2006-08-28 19:07:23 UTC (rev 56351)
@@ -150,6 +150,18 @@
assertEquals(expected, result);
}
+ public void testArrayPreinstantiated() throws Throwable
+ {
+ SimpleBean bean = customArrayExplicit();
+ assertNotNull(bean);
+
+ Object[] result = bean.getPreInstantiatedArray();
+ assertNotNull("Should be a array", result);
+
+ Object[] expected = new Object[] { string1, string2, string2, string1 };
+ assertEquals(expected, result);
+ }
+
protected SimpleBean customArrayExplicit() throws Throwable
{
Kernel kernel = bootstrap();
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-08-28 17:22:14 UTC (rev 56350)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/MapTestCase.java 2006-08-28 19:07:23 UTC (rev 56351)
@@ -229,10 +229,7 @@
return (SimpleBean) instantiateAndConfigure(configurator, bmd);
}
- /*
- * @todo - allow retrieval of map instance from the bean
- */
- public void TODOtestCustomMapPreInstantiated() throws Throwable
+ public void testCustomMapPreInstantiated() throws Throwable
{
SimpleBean bean = customMapPreInstantiated();
assertNotNull(bean);
More information about the jboss-cvs-commits
mailing list