[jboss-cvs] JBossAS SVN: r76463 - in projects/microcontainer/trunk/kernel/src: main/org/jboss/beans/metadata/spi and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 30 04:59:25 EDT 2008
Author: alesj
Date: 2008-07-30 04:59:25 -0400 (Wed, 30 Jul 2008)
New Revision: 76463
Added:
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelated.xml
projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelateds.xml
Modified:
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractRelatedClassMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/RelatedClassMetaData.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
Log:
Test bean's related.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-07-30 08:40:16 UTC (rev 76462)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java 2008-07-30 08:59:25 UTC (rev 76463)
@@ -820,6 +820,7 @@
if (aliases != null)
clone.setAliases(new HashSet<Object>(aliases));
clone.setAliasMetaData(cloneCollection(aliasMetaData, HashSet.class, AliasMetaData.class));
+ clone.setRelated(cloneCollection(related, HashSet.class, RelatedClassMetaData.class));
clone.setClassLoader(cloneObject(classLoader, ClassLoaderMetaData.class));
clone.setConstructor(cloneObject(constructor, ConstructorMetaData.class));
clone.setCreate(cloneObject(create, LifecycleMetaData.class));
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractRelatedClassMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractRelatedClassMetaData.java 2008-07-30 08:40:16 UTC (rev 76462)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractRelatedClassMetaData.java 2008-07-30 08:59:25 UTC (rev 76463)
@@ -25,12 +25,16 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import java.util.Iterator;
import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.XmlTransient;
import org.jboss.beans.metadata.spi.RelatedClassMetaData;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
+import org.jboss.beans.metadata.spi.MetaDataVisitor;
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
@@ -148,4 +152,20 @@
if (enabled != null)
clone.setEnabled(new HashSet<Object>(enabled));
}
+
+ public void initialVisit(MetaDataVisitor vistor)
+ {
+ vistor.initialVisit(this);
+ }
+
+ public void describeVisit(MetaDataVisitor vistor)
+ {
+ vistor.describeVisit(this);
+ }
+
+ @XmlTransient
+ public Iterator<? extends MetaDataVisitorNode> getChildren()
+ {
+ return null;
+ }
}
\ No newline at end of file
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/RelatedClassMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/RelatedClassMetaData.java 2008-07-30 08:40:16 UTC (rev 76462)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/RelatedClassMetaData.java 2008-07-30 08:59:25 UTC (rev 76463)
@@ -28,7 +28,7 @@
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
-public interface RelatedClassMetaData
+public interface RelatedClassMetaData extends MetaDataVisitorNode
{
/**
* Get the class name.
Copied: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelated.xml (from rev 76304, projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithDemand.xml)
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelated.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelated.xml 2008-07-30 08:59:25 UTC (rev 76463)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <related-class name="Dummy"/>
+</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelateds.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelateds.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/xml/test/BeanWithRelateds.xml 2008-07-30 08:59:25 UTC (rev 76463)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
+ <related-class name="Dummy"/>
+ <related-class name="Dummy">md</related-class>
+</bean>
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java 2008-07-30 08:40:16 UTC (rev 76462)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanJaxbTestCase.java 2008-07-30 08:59:25 UTC (rev 76463)
@@ -23,9 +23,12 @@
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.AbstractRelatedClassMetaData;
+import org.jboss.beans.metadata.spi.RelatedClassMetaData;
import org.jboss.beans.info.spi.BeanAccessMode;
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ErrorHandlingMode;
@@ -790,6 +793,65 @@
assertCallbacks(expected, bean.getUninstallCallbacks());
}
+ public void testBeanWithRelated() throws Exception
+ {
+ AbstractBeanMetaData bean = unmarshalBean();
+ assertNull(bean.getAutowireType());
+ assertNull(bean.getName());
+ assertEquals("Dummy", bean.getBean());
+ assertNull(bean.getMode());
+ assertNull(bean.getErrorHandlingMode());
+ assertNull(bean.getAccessMode());
+ assertNull(bean.getAnnotations());
+ assertNull(bean.getClassLoader());
+ assertNull(bean.getConstructor());
+ assertNull(bean.getProperties());
+ assertNull(bean.getCreate());
+ assertNull(bean.getStart());
+ assertNull(bean.getStop());
+ assertNull(bean.getDestroy());
+ assertNull(bean.getDemands());
+ assertNull(bean.getSupplies());
+ assertNull(bean.getInstalls());
+ assertNull(bean.getUninstalls());
+ assertNull(bean.getInstallCallbacks());
+ assertNull(bean.getUninstallCallbacks());
+ Set<RelatedClassMetaData> expected = new HashSet<RelatedClassMetaData>();
+ expected.add(new AbstractRelatedClassMetaData("Dummy"));
+ assertEquals(expected, bean.getRelated());
+ }
+
+ public void testBeanWithRelateds() throws Exception
+ {
+ AbstractBeanMetaData bean = unmarshalBean();
+ assertNull(bean.getAutowireType());
+ assertNull(bean.getName());
+ assertEquals("Dummy", bean.getBean());
+ assertNull(bean.getMode());
+ assertNull(bean.getErrorHandlingMode());
+ assertNull(bean.getAccessMode());
+ assertNull(bean.getAnnotations());
+ assertNull(bean.getClassLoader());
+ assertNull(bean.getConstructor());
+ assertNull(bean.getProperties());
+ assertNull(bean.getCreate());
+ assertNull(bean.getStart());
+ assertNull(bean.getStop());
+ assertNull(bean.getDestroy());
+ assertNull(bean.getDemands());
+ assertNull(bean.getSupplies());
+ assertNull(bean.getInstalls());
+ assertNull(bean.getUninstalls());
+ assertNull(bean.getInstallCallbacks());
+ assertNull(bean.getUninstallCallbacks());
+ Set<RelatedClassMetaData> expected = new HashSet<RelatedClassMetaData>();
+ expected.add(new AbstractRelatedClassMetaData("Dummy"));
+ AbstractRelatedClassMetaData arcmd = new AbstractRelatedClassMetaData("Dummy");
+ arcmd.setEnabledValue("md");
+ expected.add(arcmd);
+ assertEquals(expected, bean.getRelated());
+ }
+
/* TODO
public void testBeanBadNoClassOrConstructor() throws Exception
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java 2008-07-30 08:40:16 UTC (rev 76462)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java 2008-07-30 08:59:25 UTC (rev 76463)
@@ -23,11 +23,14 @@
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.Set;
import junit.framework.Test;
+import org.jboss.beans.info.spi.BeanAccessMode;
+import org.jboss.beans.metadata.api.model.AutowireType;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.api.model.AutowireType;
-import org.jboss.beans.info.spi.BeanAccessMode;
+import org.jboss.beans.metadata.plugins.AbstractRelatedClassMetaData;
+import org.jboss.beans.metadata.spi.RelatedClassMetaData;
import org.jboss.dependency.spi.ControllerMode;
import org.jboss.dependency.spi.ErrorHandlingMode;
@@ -888,6 +891,65 @@
assertNull(bean.getUninstallCallbacks());
}
+ public void testBeanWithRelated() throws Exception
+ {
+ AbstractBeanMetaData bean = unmarshalBean("BeanWithRelated.xml");
+ assertNull(bean.getAutowireType());
+ assertNull(bean.getName());
+ assertEquals("Dummy", bean.getBean());
+ assertNull(bean.getMode());
+ assertNull(bean.getErrorHandlingMode());
+ assertNull(bean.getAccessMode());
+ assertNull(bean.getAnnotations());
+ assertNull(bean.getClassLoader());
+ assertNull(bean.getConstructor());
+ assertNull(bean.getProperties());
+ assertNull(bean.getCreate());
+ assertNull(bean.getStart());
+ assertNull(bean.getStop());
+ assertNull(bean.getDestroy());
+ assertNull(bean.getDemands());
+ assertNull(bean.getSupplies());
+ assertNull(bean.getInstalls());
+ assertNull(bean.getUninstalls());
+ assertNull(bean.getInstallCallbacks());
+ assertNull(bean.getUninstallCallbacks());
+ Set<RelatedClassMetaData> expected = new HashSet<RelatedClassMetaData>();
+ expected.add(new AbstractRelatedClassMetaData("Dummy"));
+ assertEquals(expected, bean.getRelated());
+ }
+
+ public void testBeanWithRelateds() throws Exception
+ {
+ AbstractBeanMetaData bean = unmarshalBean("BeanWithRelateds.xml");
+ assertNull(bean.getAutowireType());
+ assertNull(bean.getName());
+ assertEquals("Dummy", bean.getBean());
+ assertNull(bean.getMode());
+ assertNull(bean.getErrorHandlingMode());
+ assertNull(bean.getAccessMode());
+ assertNull(bean.getAnnotations());
+ assertNull(bean.getClassLoader());
+ assertNull(bean.getConstructor());
+ assertNull(bean.getProperties());
+ assertNull(bean.getCreate());
+ assertNull(bean.getStart());
+ assertNull(bean.getStop());
+ assertNull(bean.getDestroy());
+ assertNull(bean.getDemands());
+ assertNull(bean.getSupplies());
+ assertNull(bean.getInstalls());
+ assertNull(bean.getUninstalls());
+ assertNull(bean.getInstallCallbacks());
+ assertNull(bean.getUninstallCallbacks());
+ Set<RelatedClassMetaData> expected = new HashSet<RelatedClassMetaData>();
+ expected.add(new AbstractRelatedClassMetaData("Dummy"));
+ AbstractRelatedClassMetaData arcmd = new AbstractRelatedClassMetaData("Dummy");
+ arcmd.setEnabledValue("md");
+ expected.add(arcmd);
+ assertEquals(expected, bean.getRelated());
+ }
+
public static Test suite()
{
return suite(BeanTestCase.class);
More information about the jboss-cvs-commits
mailing list