[jboss-cvs] JBossAS SVN: r59941 - in projects/microcontainer/trunk: kernel/src/resources/org/jboss/test/kernel/deployment/xml/test and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 23 10:46:09 EST 2007
Author: alesj
Date: 2007-01-23 10:46:09 -0500 (Tue, 23 Jan 2007)
New Revision: 59941
Added:
projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testPropertyWithPropertyValue.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyXMLTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/SerializableObject.java
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ArrayWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ClassLoaderWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/CollectionWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ConstructorWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/FactoryWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ListWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/MapWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ParameterWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PropertyWithWildcard.xml
projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/SetWithWildcard.xml
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory1.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory2.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
Log:
JBMICROCONT-142; changed JavaBeans usage of Object with SerializableObject
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerMode.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -24,14 +24,21 @@
import org.jboss.util.JBossObject;
import org.jboss.util.JBossStringBuilder;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
/**
* Mode of the context.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
-public class ControllerMode extends JBossObject
+public class ControllerMode extends JBossObject implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
/** Automatic */
public static final ControllerMode AUTOMATIC = new ControllerMode("Automatic");
@@ -47,6 +54,16 @@
/** The mode string */
protected final String modeString;
+ private static Map<String, ControllerMode> values = new HashMap<String, ControllerMode>();
+
+ static
+ {
+ values.put(AUTOMATIC.getModeString(), AUTOMATIC);
+ values.put(ON_DEMAND.getModeString(), ON_DEMAND);
+ values.put(MANUAL.getModeString(), MANUAL);
+ values.put(DISABLED.getModeString(), DISABLED);
+ }
+
/**
* Create a new mode
*
@@ -86,4 +103,10 @@
{
return modeString.hashCode();
}
+
+ protected Object readResolve() throws ObjectStreamException
+ {
+ return values.get(modeString);
+ }
+
}
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/ControllerState.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -21,22 +21,21 @@
*/
package org.jboss.dependency.spi;
-import java.io.Serializable;
+import org.jboss.util.JBossObject;
+import org.jboss.util.JBossStringBuilder;
+
import java.io.ObjectStreamException;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.util.JBossObject;
-import org.jboss.util.JBossStringBuilder;
-
/**
* Description of state.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
-public class ControllerState extends JBossObject
- implements Serializable
+public class ControllerState extends JBossObject implements Serializable
{
private static final long serialVersionUID = 1L;
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ArrayWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ArrayWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ArrayWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -3,7 +3,7 @@
<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
<property name="PropertyName">
<array>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</array>
</property>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ClassLoaderWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ClassLoaderWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ClassLoaderWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -2,6 +2,6 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<classloader>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</classloader>
</deployment>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/CollectionWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/CollectionWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/CollectionWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -3,7 +3,7 @@
<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
<property name="PropertyName">
<collection>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</collection>
</property>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ConstructorWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ConstructorWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ConstructorWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -2,6 +2,6 @@
<bean xmlns="urn:jboss:bean-deployer:2.0">
<constructor>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</constructor>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/FactoryWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/FactoryWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/FactoryWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -3,7 +3,7 @@
<bean xmlns="urn:jboss:bean-deployer:2.0">
<constructor factoryMethod="Dummy">
<factory>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</factory>
</constructor>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ListWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ListWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ListWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -3,7 +3,7 @@
<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
<property name="PropertyName">
<list>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</list>
</property>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/MapWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/MapWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/MapWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -5,10 +5,10 @@
<map>
<entry>
<key>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</key>
<value>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</value>
</entry>
</map>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ParameterWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ParameterWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/ParameterWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -3,7 +3,7 @@
<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
<constructor>
<parameter>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</parameter>
</constructor>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PropertyWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PropertyWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/PropertyWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -2,6 +2,6 @@
<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
<property name="PropertyName">
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</property>
</bean>
Modified: projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/SetWithWildcard.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/SetWithWildcard.xml 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/resources/org/jboss/test/kernel/deployment/xml/test/SetWithWildcard.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -3,7 +3,7 @@
<bean xmlns="urn:jboss:bean-deployer:2.0" class="Dummy">
<property name="PropertyName">
<set>
- <javabean xmlns="urn:jboss:javabean:1.0" class="java.lang.Object"/>
+ <javabean xmlns="urn:jboss:javabean:1.0" class="org.jboss.test.kernel.deployment.xml.support.SerializableObject"/>
</set>
</property>
</bean>
Added: projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testPropertyWithPropertyValue.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testPropertyWithPropertyValue.xml (rev 0)
+++ projects/microcontainer/trunk/kernel/src/resources/xml-test/org/jboss/test/kernel/config/test/testPropertyWithPropertyValue.xml 2007-01-23 15:46:09 UTC (rev 59941)
@@ -0,0 +1,10 @@
+<?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="MyBean" class="org.jboss.test.kernel.config.support.MyObject">
+ <property name="key" class="java.lang.String">${test.property.value}</property>
+ </bean>
+</deployment>
+
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyTestCase.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -0,0 +1,87 @@
+/*
+* 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.config.test;
+
+import junit.framework.Test;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractTypeMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
+import org.jboss.test.AbstractTestDelegate;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PropertyTestCase extends AbstractKernelConfigTest
+{
+ public PropertyTestCase(String name)
+ {
+ super(name);
+ }
+
+ public PropertyTestCase(String name, boolean xmltest)
+ {
+ super(name, xmltest);
+ }
+
+ public static Test suite()
+ {
+ return suite(PropertyTestCase.class);
+ }
+
+ public void testPropertyWithPropertyValue() throws Throwable
+ {
+ // set property to be replaced
+ final String CONST = "PropertyReplaceTestCase";
+
+ AbstractTestDelegate delegate = getDelegate();
+ delegate.enableSecurity = false;
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ System.setProperty("test.property.value", CONST);
+ return null;
+ }
+ });
+
+ // get property
+ Object value = instantiateReplacePropertyValue();
+ assertNotNull(value);
+ assertEquals(String.class, value.getClass());
+ assertEquals(CONST, value);
+ }
+
+ protected Object instantiateReplacePropertyValue() throws Throwable
+ {
+ PropertyMetaData property = new AbstractPropertyMetaData("test", "${test.property.value}", String.class.getName());
+ // TODO - update with jboss-test.jar
+// AbstractTypeMetaData atmd = assertInstanceOf(property.getValue(), AbstractTypeMetaData.class, false);
+ assertTrue(property.getValue() instanceof AbstractTypeMetaData);
+ AbstractTypeMetaData atmd = (AbstractTypeMetaData)property.getValue();
+ atmd.setConfigurator(bootstrap().getConfigurator());
+ return atmd.getValue(null, Thread.currentThread().getContextClassLoader());
+ }
+
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyXMLTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyXMLTestCase.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/PropertyXMLTestCase.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -0,0 +1,55 @@
+/*
+* 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.config.test;
+
+import junit.framework.Test;
+import org.jboss.test.kernel.config.support.MyObject;
+import org.jboss.test.kernel.config.support.XMLUtil;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PropertyXMLTestCase extends PropertyTestCase
+{
+ public PropertyXMLTestCase(String name)
+ {
+ super(name);
+ }
+
+ public PropertyXMLTestCase(String name, boolean xmltest)
+ {
+ super(name, xmltest);
+ }
+
+ public static Test suite()
+ {
+ return suite(PropertyXMLTestCase.class);
+ }
+
+ protected Object instantiateReplacePropertyValue() throws Throwable
+ {
+ XMLUtil util = bootstrapXML(true);
+ MyObject mybean = (MyObject)util.getBean("MyBean");
+ return mybean.getKey();
+ }
+
+}
Added: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/SerializableObject.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/SerializableObject.java (rev 0)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/SerializableObject.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -0,0 +1,34 @@
+/*
+* 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.support;
+
+import java.io.Serializable;
+
+/**
+ * Simple serializable class.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SerializableObject implements Serializable
+{
+ private static final long serialVersionUID = -1L;
+}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory.java 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.io.Serializable;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -35,8 +36,10 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
-public class TestBeanMetaDataFactory extends JBossObject implements BeanMetaDataFactory
+public class TestBeanMetaDataFactory extends JBossObject implements BeanMetaDataFactory, Serializable
{
+ private static final long serialVersionUID = 1L;
+
public List<BeanMetaData> getBeans()
{
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory1.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory1.java 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory1.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.io.Serializable;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -35,8 +36,10 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
-public class TestBeanMetaDataFactory1 extends JBossObject implements BeanMetaDataFactory
+public class TestBeanMetaDataFactory1 extends JBossObject implements BeanMetaDataFactory, Serializable
{
+ private static final long serialVersionUID = 1L;
+
public List<BeanMetaData> getBeans()
{
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory2.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory2.java 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/support/TestBeanMetaDataFactory2.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.io.Serializable;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -35,8 +36,10 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision$
*/
-public class TestBeanMetaDataFactory2 extends JBossObject implements BeanMetaDataFactory
+public class TestBeanMetaDataFactory2 extends JBossObject implements BeanMetaDataFactory, Serializable
{
+ private static final long serialVersionUID = 1L;
+
public List<BeanMetaData> getBeans()
{
ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
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 2007-01-23 15:32:02 UTC (rev 59940)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2007-01-23 15:46:09 UTC (rev 59941)
@@ -26,6 +26,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.io.Serializable;
import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
@@ -121,6 +122,18 @@
Object object = getJBossXBDelegate().unmarshal(url);
if (object == null)
fail("No object from " + name);
+
+ // use this once we update jboss-test.jar
+ if (object instanceof Serializable == false)
+ fail("Object not Serializable: " + object.getClass());
+
+ // TODO - update jboss-test.jar
+ //Serializable serializable = assertInstanceOf(object, Serializable.class, false);
+ Serializable serializable = (Serializable)object;
+
+ // Test that serialize/deserialize works accurately reproduces the object
+ object = deserialize(serialize(serializable));
+
assertTrue("Object '" + object + "' cannot be assigned to " + expected.getName(), expected.isAssignableFrom(object.getClass()));
return object;
}
More information about the jboss-cvs-commits
mailing list