[jboss-cvs] JBossAS SVN: r85246 - in branches/Branch_5_x/testsuite: src/etc/serialVersionUID and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 4 13:35:05 EST 2009
Author: smcgowan at redhat.com
Date: 2009-03-04 13:35:05 -0500 (Wed, 04 Mar 2009)
New Revision: 85246
Added:
branches/Branch_5_x/testsuite/src/etc/serialVersionUID/501.ser
Modified:
branches/Branch_5_x/testsuite/build.xml
branches/Branch_5_x/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java
Log:
JBAS-6555 - SerialVersionUIDUnitTestCase updates
Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml 2009-03-04 17:46:55 UTC (rev 85245)
+++ branches/Branch_5_x/testsuite/build.xml 2009-03-04 18:35:05 UTC (rev 85246)
@@ -1991,7 +1991,6 @@
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
Added: branches/Branch_5_x/testsuite/src/etc/serialVersionUID/501.ser
===================================================================
(Binary files differ)
Property changes on: branches/Branch_5_x/testsuite/src/etc/serialVersionUID/501.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java 2009-03-04 17:46:55 UTC (rev 85245)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java 2009-03-04 18:35:05 UTC (rev 85246)
@@ -86,9 +86,7 @@
"javax.xml.registry.JAXRException",
"javax.xml.registry.RegistryException",
// lib/endorsed/stax-api.jar
- "javax.xml.namespace.QName",
- // JBAS-6434
- "org.jboss.ws.metadata.wsdl.Extendable"
+ "javax.xml.namespace.QName"
};
System.out.println("+++ test423Compatibility");
@@ -114,7 +112,7 @@
public void test500Compatibility()
throws Exception
{
- // The packages in jboss-5.0.0 with known serialization issues
+ // The packages in jboss-5.0.0.GA with known serialization issues
String[] badPackages = {
"org.apache.catalina",
"org.jboss.classloading.spi.dependency.Module",
@@ -134,9 +132,7 @@
// ignore webservices framework classes
"org.jboss.wsf",
// lib/endorsed/stax-api.jar
- "javax.xml.namespace.QName",
- // JBAS-6434
- "org.jboss.ws.metadata.wsdl.Extendable"
+ "javax.xml.namespace.QName"
};
System.out.println("+++ test500Compatibility");
@@ -146,7 +142,7 @@
FileInputStream fis = new FileInputStream(serFile);
ObjectInputStream ois = new ObjectInputStream(fis);
Map classInfoMap = (Map) ois.readObject();
- System.out.println("5.0.0 serial classes count: "+classInfoMap.size());
+ System.out.println("5.0.0.GA serial classes count: "+classInfoMap.size());
Map currentClassInfoMap = calcClassInfoMap();
int mismatchCount = compare(classInfoMap, currentClassInfoMap, "500", badPackages);
@@ -157,32 +153,88 @@
}
+ /** Validate the 5.0.1.GA serial version uids against the current build
+ * @throws Exception
+ */
+ public void test501Compatibility()
+ throws Exception
+ {
+ // The packages in jboss-5.0.1.GA with known serialization issues
+ String[] badPackages = {
+ "org.apache.catalina",
+ "org.jboss.classloading.spi.dependency.Module",
+ "org.jboss.console",
+ // those were changed to match 423 ids
+ "org.jboss.crypto.JBossSXProvider",
+ "org.jboss.metadata.rar.spec.JCA15MetaData",
+ "org.jboss.resource.adapter.jdbc.CachedPreparedStatement",
+ "org.jboss.resource.metadata.ConnectorMetaData",
+ "org.jboss.resource.metadata.DescriptionMetaDataContainer",
+ "org.jboss.security.SimplePrincipal",
+ "org.jboss.security.SubjectSecurityProxyFactory",
+ "org.jboss.services.binding.DuplicateServiceException",
+ // unclear if vfs classes are serialized to client
+ "org.jboss.virtual.plugins.context.vfs.AssembledDirectoryHandler",
+ "org.jboss.virtual.plugins.context.zip.ZipEntryHandler",
+ // ignore webservices framework classes
+ "org.jboss.wsf",
+ // lib/endorsed/stax-api.jar
+ "javax.xml.namespace.QName"
+ };
+
+ System.out.println("+++ test501Compatibility");
+ // load the 5.0.1.GA serialVersionUID database
+ String etc = System.getProperty("jbosstest.src.etc", "../src/etc");
+ File serFile = new File(etc, "serialVersionUID/501.ser");
+ FileInputStream fis = new FileInputStream(serFile);
+ ObjectInputStream ois = new ObjectInputStream(fis);
+ Map classInfoMap = (Map) ois.readObject();
+ System.out.println("5.0.1.GA serial classes count: "+classInfoMap.size());
+
+ Map currentClassInfoMap = calcClassInfoMap();
+ int mismatchCount = compare(classInfoMap, currentClassInfoMap, "501", badPackages);
+ currentClassInfoMap.clear();
+ System.out.println("serialVersionUID mismatches = "+mismatchCount);
+ assertTrue("There are no serialVersionUID mismatches("+mismatchCount+")",
+ mismatchCount == 0);
+ }
+
/** Validate the JavaEE 5.0 RI serial version uids against the current build
* @throws Exception
*/
public void testJavaEE50Compatibility()
throws Exception
{
- // The packages to e excluded known serialization issues
+ // The packages excluded with known serialization issues
String[] badPackages = {
- // Ignore org.apache.* issues
- "org.apache",
- //JBAS-5872 - serialVersionUID mismatches from JavaEE 5.0 RI to be resolved
- "com.sun.faces.config.JSFVersionTracker",
- "com.sun.faces.lifecycle.ELResolverInitPhaseListener",
- "javax.faces.component.UIComponentBase$ChildrenList",
- "javax.faces.component.UIComponentBase$FacetsMap",
- "org.omg.CosTransactions.Status",
- "org.omg.CosTransactions.Vote",
- "org.omg.CosTransactions._ControlStub",
- "org.omg.CosTransactions._CoordinatorStub",
- "org.omg.CosTransactions._RecoveryCoordinatorStub",
- "org.omg.CosTransactions._ResourceStub",
- "org.omg.CosTransactions._SubtransactionAwareResourceStub",
- "org.omg.CosTransactions._SynchronizationStub",
- "org.omg.CosTransactions._TerminatorStub",
- "org.omg.CosTransactions._TransactionFactoryStub",
- "org.omg.CosTransactions._TransactionalObjectStub"
+ "org.apache",
+ "com.sun.faces.config.JSFVersionTracker",
+ "com.sun.faces.lifecycle.ELResolverInitPhaseListener",
+ "com.sun.faces.taglib.jsf_core.ConverterTag",
+ "com.sun.faces.taglib.jsf_core.LoadBundleTag",
+ "com.sun.faces.taglib.jsf_core.PhaseListenerTag",
+ "com.sun.faces.taglib.jsf_core.ValidatorTag",
+ "javax.servlet.GenericServlet",
+ "javax.servlet.ServletException",
+ "javax.xml.registry.JAXRException",
+ "javax.xml.registry.RegistryException",
+ "javax.persistence.OptimisticLockException",
+ "javax.ejb.ConcurrentAccessException",
+ "javax.faces.component.UIComponentBase$ChildrenList",
+ "javax.faces.component.UIComponentBase$FacetsMap",
+ "javax.faces.component.UIComponentBase$AttributesMap",
+ "javax.xml.ws.soap.SOAPFaultException",
+ "org.omg.CosTransactions.Status",
+ "org.omg.CosTransactions.Vote",
+ "org.omg.CosTransactions._ControlStub",
+ "org.omg.CosTransactions._CoordinatorStub",
+ "org.omg.CosTransactions._RecoveryCoordinatorStub",
+ "org.omg.CosTransactions._ResourceStub",
+ "org.omg.CosTransactions._SubtransactionAwareResourceStub",
+ "org.omg.CosTransactions._SynchronizationStub",
+ "org.omg.CosTransactions._TerminatorStub",
+ "org.omg.CosTransactions._TransactionFactoryStub",
+ "org.omg.CosTransactions._TransactionalObjectStub"
};
System.out.println("+++ testJavaEE50Compatibility");
@@ -231,11 +283,11 @@
if( isInBadPkg == false )
{
mismatchCount ++;
- System.err.println(msg);
+ System.err.println("FAIL: " + msg);
}
else
{
- System.out.println(msg);
+ System.out.println("EXCLUDED: " + msg);
}
}
}
@@ -249,8 +301,7 @@
File jbossHome = new File(jbossDist);
jbossHome = jbossHome.getCanonicalFile();
System.out.println("Calculating serialVersionUIDs for jbossHome: "+jbossHome);
- Map classInfoMap = SerialVersionUID.generateJBossSerialVersionUIDReport(
- jbossHome);
+ Map classInfoMap = SerialVersionUID.generateJBossSerialVersionUIDReport(jbossHome);
return classInfoMap;
}
@@ -261,7 +312,8 @@
TestSuite suite = new TestSuite();
suite.addTest(new SerialVersionUIDUnitTestCase("test423Compatibility"));
suite.addTest(new SerialVersionUIDUnitTestCase("test500Compatibility"));
- //suite.addTest(new SerialVersionUIDUnitTestCase("testJavaEE50Compatibility"));
+ suite.addTest(new SerialVersionUIDUnitTestCase("test501Compatibility"));
+ suite.addTest(new SerialVersionUIDUnitTestCase("testJavaEE50Compatibility"));
return suite;
}
More information about the jboss-cvs-commits
mailing list