[jboss-cvs] JBossAS SVN: r59966 - in projects/microcontainer/trunk: kernel/src/tests/org/jboss/test/kernel/deployment/xml/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-01-24 09:01:19 -0500 (Wed, 24 Jan 2007)
New Revision: 59966

Modified:
   projects/microcontainer/trunk/build/build-thirdparty.xml
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
Log:
Updated jboss-test with current snapshot.

Modified: projects/microcontainer/trunk/build/build-thirdparty.xml
===================================================================
--- projects/microcontainer/trunk/build/build-thirdparty.xml	2007-01-24 12:47:19 UTC (rev 59965)
+++ projects/microcontainer/trunk/build/build-thirdparty.xml	2007-01-24 14:01:19 UTC (rev 59966)
@@ -58,8 +58,8 @@
       <componentref name="jboss/aop" version="snapshot" />
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/jbossretro" version="1.0.4.GA"/>
-      <componentref name="jboss/test" version="1.0.0.GA"/>
-      <componentref name="jboss/test14" version="1.0.0.GA"/>
+      <componentref name="jboss/test" version="snapshot"/>
+      <componentref name="jboss/test14" version="snapshot"/>
       <componentref name="osgi" version="4.0"/>
       <componentref name="oswego-concurrent" version="1.3.4"/>
       <componentref name="sun-javacc" version="4.0"/>

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-24 12:47:19 UTC (rev 59965)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java	2007-01-24 14:01:19 UTC (rev 59966)
@@ -21,12 +21,12 @@
 */
 package org.jboss.test.kernel.deployment.xml.test;
 
+import java.io.Serializable;
 import java.net.URL;
 import java.util.HashSet;
 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;
@@ -123,14 +123,8 @@
       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());
+      Serializable serializable = assertInstanceOf(object, Serializable.class, false);
 
-      // 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));