[jboss-cvs] JBossAS SVN: r68731 - in projects/microcontainer/trunk/kernel/src: resources/tests/org/jboss/test/kernel/deployment/xml/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 9 09:48:19 EST 2008
Author: alesj
Date: 2008-01-09 09:48:19 -0500 (Wed, 09 Jan 2008)
New Revision: 68731
Added:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ArrayWithBean.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/CollectionWithBean.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ListWithBean.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/MapWithBean.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/SetWithBean.xml
Removed:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractBeanMetaDataTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java
Log:
JBMICROCONT-28.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractArrayMetaData.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -21,18 +21,17 @@
*/
package org.jboss.beans.metadata.plugins;
+import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
-import java.lang.reflect.Array;
-
import javax.xml.bind.annotation.XmlType;
import org.jboss.reflect.spi.ClassInfo;
import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.xb.annotations.JBossXmlNoElements;
-import org.jboss.xb.annotations.JBossXmlChildren;
import org.jboss.xb.annotations.JBossXmlChild;
import org.jboss.xb.annotations.JBossXmlChildWildcard;
+import org.jboss.xb.annotations.JBossXmlChildren;
+import org.jboss.xb.annotations.JBossXmlNoElements;
/**
* Array metadata.
@@ -45,6 +44,7 @@
@JBossXmlNoElements
@JBossXmlChildren
({
+ @JBossXmlChild(name="bean", type=AbstractBeanMetaData.class),
@JBossXmlChild(name="array", type=AbstractArrayMetaData.class),
@JBossXmlChild(name="collection", type=AbstractCollectionMetaData.class),
@JBossXmlChild(name="inject", type=AbstractInjectionValueMetaData.class),
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCollectionMetaData.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -25,21 +25,20 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlAttribute;
import org.jboss.beans.metadata.spi.MetaDataVisitor;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.reflect.spi.ClassInfo;
import org.jboss.reflect.spi.TypeInfo;
-import org.jboss.reflect.spi.ClassInfo;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
-import org.jboss.xb.annotations.JBossXmlNoElements;
-import org.jboss.xb.annotations.JBossXmlChildren;
import org.jboss.xb.annotations.JBossXmlChild;
import org.jboss.xb.annotations.JBossXmlChildWildcard;
+import org.jboss.xb.annotations.JBossXmlChildren;
+import org.jboss.xb.annotations.JBossXmlNoElements;
/**
* Collection metadata.
@@ -52,6 +51,7 @@
@JBossXmlNoElements
@JBossXmlChildren
({
+ @JBossXmlChild(name="bean", type=AbstractBeanMetaData.class),
@JBossXmlChild(name="array", type=AbstractArrayMetaData.class),
@JBossXmlChild(name="collection", type=AbstractCollectionMetaData.class),
@JBossXmlChild(name="inject", type=AbstractInjectionValueMetaData.class),
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractListMetaData.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -25,14 +25,13 @@
import java.util.Collection;
import java.util.List;
import java.util.ListIterator;
-
import javax.xml.bind.annotation.XmlType;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
-import org.jboss.xb.annotations.JBossXmlNoElements;
-import org.jboss.xb.annotations.JBossXmlChildren;
import org.jboss.xb.annotations.JBossXmlChild;
import org.jboss.xb.annotations.JBossXmlChildWildcard;
+import org.jboss.xb.annotations.JBossXmlChildren;
+import org.jboss.xb.annotations.JBossXmlNoElements;
/**
* List metadata.
@@ -45,6 +44,7 @@
@JBossXmlNoElements
@JBossXmlChildren
({
+ @JBossXmlChild(name="bean", type=AbstractBeanMetaData.class),
@JBossXmlChild(name="array", type=AbstractArrayMetaData.class),
@JBossXmlChild(name="collection", type=AbstractCollectionMetaData.class),
@JBossXmlChild(name="inject", type=AbstractInjectionValueMetaData.class),
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractSetMetaData.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -25,14 +25,13 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-
import javax.xml.bind.annotation.XmlType;
import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
-import org.jboss.xb.annotations.JBossXmlNoElements;
-import org.jboss.xb.annotations.JBossXmlChildren;
import org.jboss.xb.annotations.JBossXmlChild;
import org.jboss.xb.annotations.JBossXmlChildWildcard;
+import org.jboss.xb.annotations.JBossXmlChildren;
+import org.jboss.xb.annotations.JBossXmlNoElements;
/**
* Set metadata.
@@ -45,6 +44,7 @@
@JBossXmlNoElements
@JBossXmlChildren
({
+ @JBossXmlChild(name="bean", type=AbstractBeanMetaData.class),
@JBossXmlChild(name="array", type=AbstractArrayMetaData.class),
@JBossXmlChild(name="collection", type=AbstractCollectionMetaData.class),
@JBossXmlChild(name="inject", type=AbstractInjectionValueMetaData.class),
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ArrayWithBean.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ArrayWithBean.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ArrayWithBean.xml 2008-01-09 14:48:19 UTC (rev 68731)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <property name="PropertyName">
+ <array>
+ <bean class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+ </array>
+ </property>
+</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/CollectionWithBean.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/CollectionWithBean.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/CollectionWithBean.xml 2008-01-09 14:48:19 UTC (rev 68731)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <property name="PropertyName">
+ <collection>
+ <bean class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+ </collection>
+ </property>
+</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ListWithBean.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ListWithBean.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/ListWithBean.xml 2008-01-09 14:48:19 UTC (rev 68731)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <property name="PropertyName">
+ <list>
+ <bean class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+ </list>
+ </property>
+</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/MapWithBean.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/MapWithBean.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/MapWithBean.xml 2008-01-09 14:48:19 UTC (rev 68731)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <property name="PropertyName">
+ <map>
+ <entry>
+ <key>
+ <bean class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+ </key>
+ <value>
+ <bean class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+ </value>
+ </entry>
+ </map>
+ </property>
+</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/SetWithBean.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/SetWithBean.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/SetWithBean.xml 2008-01-09 14:48:19 UTC (rev 68731)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <property name="PropertyName">
+ <set>
+ <bean class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
+ </set>
+ </property>
+</bean>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractBeanMetaDataTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractBeanMetaDataTest.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/AbstractBeanMetaDataTest.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -74,14 +74,17 @@
assertEquals(2, beans6.size());
SimpleBean inner61 = beans6.get(0);
assertNotNull(inner61);
+ assertSame(inner61, getBean("inner61"));
SimpleBean inner71 = inner61.getBean();
assertNotNull(inner71);
assertEquals("InnerBean71", inner71.getString());
+ assertSame(inner71, getBean("inner71"));
SimpleBean inner62 = beans6.get(1);
assertNotNull(inner62);
+ assertSame(inner61, getBean("inner61"));
SimpleBean inner72 = inner62.getBean();
assertNotNull(inner72);
assertEquals("InnerBean72", inner72.getString());
+ assertSame(inner72, getBean("inner72"));
}
-
}
Deleted: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -1,286 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* 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.xml.test;
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractCollectionMetaData;
-import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.plugins.AbstractListMetaData;
-import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
-import org.jboss.beans.metadata.plugins.AbstractSetMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
-import org.jboss.beans.metadata.plugins.ThisValueMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
-import org.jboss.beans.metadata.spi.AnnotationMetaData;
-import org.jboss.beans.metadata.spi.CallbackMetaData;
-import org.jboss.beans.metadata.spi.DemandMetaData;
-import org.jboss.beans.metadata.spi.DependencyMetaData;
-import org.jboss.beans.metadata.spi.InstallMetaData;
-import org.jboss.beans.metadata.spi.ParameterMetaData;
-import org.jboss.beans.metadata.spi.PropertyMetaData;
-import org.jboss.beans.metadata.spi.SupplyMetaData;
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.javabean.plugins.jaxb.JavaBean;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-import org.jboss.test.xb.builder.AbstractBuilderTest;
-import org.jboss.xb.binding.JBossXBException;
-
-/**
- * AbstractMCTest.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class AbstractMCTest extends AbstractBuilderTest
-{
- public AbstractMCTest(String name)
- {
- super(name);
- }
-
- protected AbstractKernelDeployment unmarshalDeployment() throws Exception
- {
- return unmarshalObject(AbstractKernelDeployment.class, AbstractKernelDeployment.class, JavaBean.class);
- }
-
- protected AbstractBeanMetaData unmarshalBean() throws Exception
- {
- return unmarshalObject(AbstractBeanMetaData.class, AbstractKernelDeployment.class, JavaBean.class);
- }
-
- protected GenericBeanFactoryMetaData2 unmarshalBeanFactory() throws Exception
- {
- return unmarshalObject(GenericBeanFactoryMetaData2.class, AbstractKernelDeployment.class, JavaBean.class);
- }
-
- protected void assertAnnotations(Set<String> expected, Set<AnnotationMetaData> annotations)
- {
- assertNotNull(annotations);
- assertEquals(expected.size(), annotations.size());
- HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = annotations.iterator(); i.hasNext();)
- {
- AnnotationMetaData annotation = (AnnotationMetaData) i.next();
- if (clonedExpected.remove(annotation.getAnnotationInstance().annotationType().getName()) == false)
- fail("Did not expect " + annotation + " expected " + expected);
- }
- if (clonedExpected.size() != 0)
- fail("Expected " + expected + " got " + annotations);
- }
-
- protected void assertProperties(Set<String> expected, Set<PropertyMetaData> properties)
- {
- assertNotNull(properties);
- assertEquals(expected.size(), properties.size());
- HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = properties.iterator(); i.hasNext();)
- {
- PropertyMetaData property = (PropertyMetaData) i.next();
- if (clonedExpected.remove(property.getName()) == false)
- fail("Did not expect " + property + " expected " + expected);
- }
- if (clonedExpected.size() != 0)
- fail("Expected " + expected + " got " + properties);
- }
-
- protected void assertDepends(Set<String> expected, Set<DependencyMetaData> depends)
- {
- assertNotNull(depends);
- assertEquals(expected.size(), depends.size());
- HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (DependencyMetaData depend : depends)
- {
- if (clonedExpected.remove(depend.getDependency()) == false)
- fail("Did not expect " + depend + " expected " + expected);
- }
- if (clonedExpected.size() != 0)
- fail("Expected " + expected + " got " + depends);
- }
-
- protected void assertDemands(Set<String> expected, Set<DemandMetaData> demands)
- {
- assertNotNull(demands);
- assertEquals(expected.size(), demands.size());
- HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (DemandMetaData demand : demands)
- {
- if (clonedExpected.remove(demand.getDemand()) == false)
- fail("Did not expect " + demand + " expected " + expected);
- }
- if (clonedExpected.size() != 0)
- fail("Expected " + expected + " got " + demands);
- }
-
- protected void assertSupplies(Set<String> expected, Set<SupplyMetaData> supplies)
- {
- assertNotNull(supplies);
- assertEquals(expected.size(), supplies.size());
- HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator i = supplies.iterator(); i.hasNext();)
- {
- SupplyMetaData supply = (SupplyMetaData) i.next();
- if (clonedExpected.remove(supply.getSupply()) == false)
- fail("Did not expect " + supply + " expected " + expected);
- }
- if (clonedExpected.size() != 0)
- fail("Expected " + expected + " got " + supplies);
- }
-
- protected void assertInstalls(List expected, List installs)
- {
- assertNotNull(installs);
- assertEquals(expected.size(), installs.size());
- for (int i = 0; i < expected.size(); ++i)
- {
- InstallMetaData install = (InstallMetaData) installs.get(i);
- String method = (String) expected.get(i);
- assertEquals(method, install.getMethodName());
- }
- }
-
- protected void assertCallbacks(List expected, List callbacks)
- {
- assertNotNull(callbacks);
- assertEquals(expected.size(), callbacks.size());
- for (int i = 0; i < expected.size(); ++i)
- {
- CallbackMetaData callback = (CallbackMetaData) callbacks.get(i);
- String method = (String) expected.get(i);
- assertEquals(method, callback.getMethodName());
- }
- }
-
- protected void assertParameters(List expected, List parameters)
- {
- assertNotNull(parameters);
- assertEquals(expected.size(), parameters.size());
- for (int i = 0; i < expected.size(); ++i)
- {
- ParameterMetaData parameter = (ParameterMetaData) parameters.get(i);
- String method = (String) expected.get(i);
- assertEquals(method, parameter.getType());
- }
- }
-
- protected void assertPlainValue(String expected, ValueMetaData valueMetaData)
- {
- assertValue(expected, valueMetaData);
- }
-
- protected void assertValue(String expected, ValueMetaData valueMetaData)
- {
- assertNotNull(valueMetaData);
- assertTrue(valueMetaData instanceof StringValueMetaData);
- Object value = valueMetaData.getUnderlyingValue();
- assertEquals(expected, value);
- }
-
- protected void assertInjection(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractDependencyValueMetaData);
- }
-
- protected void assertNullValue(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractValueMetaData);
- assertNull(value.getUnderlyingValue());
- }
-
- protected void assertWildcard(ValueMetaData value)
- {
- assertNotNull(value);
- assertEquals(AbstractValueMetaData.class, value.getClass());
- Object wildcard = value.getUnderlyingValue();
- assertNotNull(wildcard);
- }
-
- protected void assertCollection(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractCollectionMetaData);
- }
-
- protected void assertList(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractListMetaData);
- }
-
- protected void assertSet(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractSetMetaData);
- }
-
- protected void assertArray(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractArrayMetaData);
- }
-
- protected void assertMap(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof AbstractMapMetaData);
- }
-
- protected void assertThis(ValueMetaData value)
- {
- assertNotNull(value);
- assertTrue(value instanceof ThisValueMetaData);
- }
-
- protected void checkJBossXBException(Class expected, Throwable throwable)
- {
- checkThrowable(JBossXBException.class, throwable);
- JBossXBException e = (JBossXBException) throwable;
- checkThrowable(expected, e.getCause());
- }
-
- /**
- * Find the xml
- *
- * @param name the name
- * @return the url of the xml
- */
- protected String findXML(String name)
- {
- name = getName().substring(4) + ".xml";
-
- URL url = getClass().getResource(name);
- if (url == null)
- fail(name + " not found");
- return url.toString();
- }
-}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -40,6 +40,7 @@
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.CallbackMetaData;
import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.DependencyMetaData;
@@ -347,6 +348,12 @@
assertTrue(value instanceof ThisValueMetaData);
}
+ protected void assertBean(ValueMetaData value)
+ {
+ assertNotNull(value);
+ assertTrue(value instanceof BeanMetaData);
+ }
+
protected void checkJBossXBException(Class<? extends Throwable> expected, Throwable throwable)
{
checkThrowable(JBossXBException.class, throwable);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,7 +24,6 @@
import java.util.Set;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -152,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testArrayWithBean() throws Exception
+ {
+ AbstractArrayMetaData collection = getCollection();
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractArrayMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ArrayTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,7 +24,6 @@
import java.util.Set;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
@@ -153,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testArrayWithBean() throws Exception
+ {
+ AbstractArrayMetaData collection = getCollection("ArrayWithBean.xml");
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractArrayMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -26,7 +26,6 @@
import java.util.List;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData2;
import org.jboss.dependency.spi.ControllerMode;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -21,12 +21,10 @@
*/
package org.jboss.test.kernel.deployment.xml.test;
+import junit.framework.Test;
import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-import junit.framework.Test;
-
/**
* ClassLoaderTestCase.
*
@@ -46,8 +44,7 @@
public void testClassLoaderWithBean() throws Exception
{
ClassLoaderMetaData classLoader = getClassLoader("ClassLoaderWithBean.xml");
- assertNotNull(classLoader.getClassLoader());
- assertTrue(classLoader.getClassLoader() instanceof BeanMetaData);
+ assertBean(classLoader.getClassLoader());
}
public void testClassLoaderWithInject() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -152,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testCollectionWithBean() throws Exception
+ {
+ AbstractCollectionMetaData collection = getCollection();
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractCollectionMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CollectionTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,7 +24,6 @@
import java.util.Set;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractCollectionMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
@@ -153,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testCollectionWithBean() throws Exception
+ {
+ AbstractCollectionMetaData collection = getCollection("CollectionWithBean.xml");
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractCollectionMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -26,7 +26,6 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.test.kernel.deployment.xml.support.Annotation1;
import org.jboss.test.kernel.deployment.xml.support.Annotation2;
@@ -67,8 +66,7 @@
assertNull(constructor.getAnnotations());
assertNull(constructor.getFactory());
assertNull(constructor.getParameters());
- assertNotNull(constructor.getValue());
- assertTrue(constructor.getValue() instanceof BeanMetaData);
+ assertBean(constructor.getValue());
}
public void testConstructorWithFactoryClass() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,12 +24,10 @@
import java.util.ArrayList;
import java.util.HashSet;
+import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import junit.framework.Test;
-
/**
* ConstructorTestCase.
*
@@ -65,8 +63,7 @@
assertNull(constructor.getAnnotations());
assertNull(constructor.getFactory());
assertNull(constructor.getParameters());
- assertNotNull(constructor.getValue());
- assertTrue(constructor.getValue() instanceof BeanMetaData);
+ assertBean(constructor.getValue());
}
public void testConstructorWithFactoryClass() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -152,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testListWithBean() throws Exception
+ {
+ AbstractListMetaData collection = getCollection();
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractListMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ListTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,7 +24,6 @@
import java.util.Set;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractListMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
@@ -153,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testListWithBean() throws Exception
+ {
+ AbstractListMetaData collection = getCollection("ListWithBean.xml");
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractListMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -183,6 +183,16 @@
assertWildcard(getValue(map));
}
+ public void testMapWithBean() throws Exception
+ {
+ AbstractMapMetaData map = getMap();
+ assertNull(map.getType());
+ assertNull(map.getKeyType());
+ assertNull(map.getValueType());
+ assertBean(getKey(map));
+ assertBean(getValue(map));
+ }
+
protected ValueMetaData getKey(AbstractMapMetaData map)
{
assertEquals(1, map.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/MapTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,7 +24,6 @@
import java.util.Set;
import junit.framework.Test;
-
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractMapMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
@@ -184,6 +183,16 @@
assertWildcard(getValue(map));
}
+ public void testMapWithBean() throws Exception
+ {
+ AbstractMapMetaData map = getMap("MapWithBean.xml");
+ assertNull(map.getType());
+ assertNull(map.getKeyType());
+ assertNull(map.getValueType());
+ assertBean(getKey(map));
+ assertBean(getValue(map));
+ }
+
protected ValueMetaData getKey(AbstractMapMetaData map)
{
assertEquals(1, map.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -26,7 +26,6 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.test.kernel.deployment.xml.support.Annotation1;
@@ -66,8 +65,7 @@
{
ParameterMetaData parameter = getParameter();
assertNull(parameter.getAnnotations());
- assertNotNull(parameter.getValue());
- assertTrue(parameter.getValue() instanceof BeanMetaData);
+ assertBean(parameter.getValue());
}
public void testParameterWithClass() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ParameterTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,13 +24,11 @@
import java.util.HashSet;
import java.util.List;
+import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.ConstructorMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import junit.framework.Test;
-
/**
* ParameterTestCase.
*
@@ -64,8 +62,7 @@
{
ParameterMetaData parameter = getParameter("ParameterWithBean.xml");
assertNull(parameter.getAnnotations());
- assertNotNull(parameter.getValue());
- assertTrue(parameter.getValue() instanceof BeanMetaData);
+ assertBean(parameter.getValue());
}
public void testParameterWithClass() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -27,7 +27,6 @@
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.StringValueMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.test.kernel.deployment.xml.support.Annotation1;
@@ -67,8 +66,7 @@
assertNotNull("PropertyName", property.getName());
assertNull(property.getAnnotations());
ValueMetaData value = property.getValue();
- assertNotNull(value);
- assertTrue(value instanceof BeanMetaData);
+ assertBean(value);
}
public void testPropertyWithClass() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,14 +24,12 @@
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.StringValueMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import junit.framework.Test;
-
/**
* PropertyTestCase.
*
@@ -65,8 +63,7 @@
assertNotNull("PropertyName", property.getName());
assertNull(property.getAnnotations());
ValueMetaData value = property.getValue();
- assertNotNull(value);
- assertTrue(value instanceof BeanMetaData);
+ assertBean(value);
}
public void testPropertyWithClass() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetJaxbTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -152,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testSetWithBean() throws Exception
+ {
+ AbstractSetMetaData collection = getCollection();
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractSetMetaData collection)
{
assertEquals(1, collection.size());
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java 2008-01-09 13:17:46 UTC (rev 68730)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SetTestCase.java 2008-01-09 14:48:19 UTC (rev 68731)
@@ -24,7 +24,6 @@
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.spi.PropertyMetaData;
@@ -153,6 +152,14 @@
assertWildcard(getValue(collection));
}
+ public void testSetWithBean() throws Exception
+ {
+ AbstractSetMetaData collection = getCollection("SetWithBean.xml");
+ assertNull(collection.getType());
+ assertNull(collection.getElementType());
+ assertBean(getValue(collection));
+ }
+
protected ValueMetaData getValue(AbstractSetMetaData collection)
{
assertEquals(1, collection.size());
More information about the jboss-cvs-commits
mailing list