[jboss-cvs] JBossAS SVN: r82017 - in trunk/testsuite: src/etc/serialVersionUID and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 3 14:35:25 EST 2008
Author: smcgowan at redhat.com
Date: 2008-12-03 14:35:24 -0500 (Wed, 03 Dec 2008)
New Revision: 82017
Added:
trunk/testsuite/src/etc/serialVersionUID/423.ser
trunk/testsuite/src/etc/serialVersionUID/javaee500.ser
Removed:
trunk/testsuite/src/etc/serialVersionUID/401.ser
trunk/testsuite/src/etc/serialVersionUID/j2ee141.ser
Modified:
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/compatibility/test/matrix/MatrixTestContainer.java
Log:
JBAS-5872 - update SerialVersionUIDUnitTestCase
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-12-03 18:22:36 UTC (rev 82016)
+++ trunk/testsuite/build.xml 2008-12-03 19:35:24 UTC (rev 82017)
@@ -937,7 +937,6 @@
<patternset refid="iiop.excludes"/>
<patternset refid="jbossxb.excludes"/>
<patternset refid="deployment-service.excludes"/>
- <patternset refid="compatibility.excludes"/>
<patternset refid="binding-manager.excludes"/>
<patternset refid="profileservice.excludes"/>
<patternset refid="profileservice.restart.excludes"/>
Deleted: trunk/testsuite/src/etc/serialVersionUID/401.ser
===================================================================
(Binary files differ)
Added: trunk/testsuite/src/etc/serialVersionUID/423.ser
===================================================================
(Binary files differ)
Property changes on: trunk/testsuite/src/etc/serialVersionUID/423.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/testsuite/src/etc/serialVersionUID/j2ee141.ser
===================================================================
(Binary files differ)
Added: trunk/testsuite/src/etc/serialVersionUID/javaee500.ser
===================================================================
(Binary files differ)
Property changes on: trunk/testsuite/src/etc/serialVersionUID/javaee500.ser
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java 2008-12-03 18:22:36 UTC (rev 82016)
+++ trunk/testsuite/src/main/org/jboss/test/compatibility/test/SerialVersionUIDUnitTestCase.java 2008-12-03 19:35:24 UTC (rev 82017)
@@ -51,146 +51,86 @@
super(name);
}
- /** Validate the 4.0.1 serial version uids against the current build
+ /** Validate the 4.2.3.GA serial version uids against the current build
* @throws Exception
*/
- public void test401Compatibility()
+ public void test423Compatibility()
throws Exception
{
- // The packages in jboss-4.0.x with known 4.0.1 serialization issues
+ // The packages in jboss-4.2.3 with known serialization issues
String[] badPackages = {
- // Ignore javassist.* issues
- "javassist",
- // Ignore org.apache.* issues
+ // Ignore org.apache.* issues
"org.apache",
- // Ignore jacorb packages org.jacorb.*, org.omg.*
- "org.jacorb",
- "org.omg",
- /* Ignore the aop package for 4.0.1 since this will be in flux until
- jboss5/ejb3 is stablized
- */
- "org.jboss.aop",
- /* Ignore org.jboss.webservice for 4.0.1 since the org.apache.axis to
- org.jboss.axis package name change breaks serialization
- */
- "org.jboss.webservice",
- /* Ignore org.hsqldb as there are some utility classes that changed
- in the upgrade to 1_8_0
- */
- "org.hsqldb",
- /* Ignore javacc generated classes
- */
- "org.jboss.ejb.plugins.cmp.ejbql.TokenMgrError",
- "org.jboss.mq.selectors.TokenMgrError",
- "org.jboss.security.auth.login.TokenMgrError",
- // upgrade to jboss-web 2.x
- "javax.servlet.ServletException",
- "javax.servlet.jsp.JspException",
- "javax.servlet.jsp.jstl.core.LoopTagSupport",
- "javax.servlet.jsp.tagext.TagSupport",
- /* The bundled javax.xml.namespace.QName is not compatible with the
- jdk5/xerces 2.7.x version bundled with 4.0.x
- */
- "javax.xml.namespace.QName",
- // ?
- "javax.xml.bind.JAXBException",
- // Upgrade JAXR: JBAS-5784/JAXR-6
- "javax.xml.registry.JAXRException",
- "javax.xml.registry.RegistryException",
- // upgrade to jbossws-2.0.1
- "javax.xml.rpc.JAXRPCException",
- "javax.xml.rpc.ServiceException",
- "javax.xml.rpc.soap.SOAPFaultException",
- "javax.xml.soap.SOAPException",
- // Ignore dom4j issues
- "org.dom4j",
- // Ignore jgroups issues after the upgrade to 2.4.1
+ // Ignore jgroups issues
"org.jgroups",
- // Ignore jboss console stuff
- "org.jboss.console",
- // Ignore corba servant locators
- "org.jboss.invocation.iiop.IIOPInvoker$PersistentServantLocator",
- "org.jboss.invocation.iiop.IIOPInvoker$TransientServantLocator",
- // jboss remoting upgrade to 2.0.0.GA
- "org.jboss.remoting",
- // jboss resource adaptor jdbc vendor
- "org.jboss.resource.adapter.jdbc.vendor",
- // serialVersionUIDs were added at v4.0.4
- "org.jboss.monitor.alarm.AlarmNotification",
- "org.jboss.monitor.alarm.AlarmTableNotification",
- // Ignore the JacORB IDL compiler generated stubs/ties
- "org.jboss.tm.iiop._CoordinatorExtStub",
- "org.jboss.tm.iiop._TransactionFactoryExtStub",
- "org.jboss.tm.iiop._TransactionServiceStub",
- "org.jboss.iiop.csiv2.SASCurrentLocalTie",
- // JBAS-4148, ignore org.jfree classes
- "org.jfree",
- // Ignore javacc generated classes
- "org.jboss.ejb.plugins.cmp.ejbql.TokenMgrError",
- "org.jboss.mq.selectors.TokenMgrError",
- "org.jboss.security.auth.login.TokenMgrError",
- // Ignore incompatible classes from the sun-javamail upgrade, JBAS-3488
- "com.sun.mail.imap.protocol.IMAPAddress",
- "javax.mail.MessagingException",
- // jmx
- "javax.management.loading.MLet",
- // JBAS-3736, jaxen-1.1-beta9 has different serialVersionUIDs than beta4
- "org.jaxen"
+ //JBAS-5872 - serialVersionUID mismatches from 4.2.3.GA to be resolved
+ "org.jboss.aspects.versioned.StateManager",
+ "org.jboss.cache.CacheException",
+ "org.jboss.cache.Fqn",
+ "org.jboss.cache.Modification",
+ "org.jboss.cache.ReplicationException",
+ "org.jboss.logging.XLevel",
+ "org.jboss.mx.util.InstanceOfQueryExp",
+ "org.jboss.virtual.plugins.context.jar.NestedJarFromStream"
};
- System.out.println("+++ test401Compatibility");
- // load the 4.0.1 serialVersionUID database
+ System.out.println("+++ test423Compatibility");
+ // load the 4.2.3 serialVersionUID database
String etc = System.getProperty("jbosstest.src.etc", "../src/etc");
- File serFile = new File(etc, "serialVersionUID/401.ser");
+ File serFile = new File(etc, "serialVersionUID/423.ser");
FileInputStream fis = new FileInputStream(serFile);
ObjectInputStream ois = new ObjectInputStream(fis);
Map classInfoMap = (Map) ois.readObject();
- System.out.println("4.0.1 serial classes count: "+classInfoMap.size());
+ System.out.println("4.2.3 serial classes count: "+classInfoMap.size());
System.setProperty("org.jboss.j2ee.LegacySerialization", "true");
Map currentClassInfoMap = calcClassInfoMap();
- int mismatchCount = compare(classInfoMap, currentClassInfoMap, "401", badPackages);
+ int mismatchCount = compare(classInfoMap, currentClassInfoMap, "423", badPackages);
currentClassInfoMap.clear();
System.out.println("serialVersionUID mismatches = "+mismatchCount);
assertTrue("There are no serialVersionUID mismatches("+mismatchCount+")",
mismatchCount == 0);
}
- /** Validate the J2EE 1.4.1 RI serial version uids against the current build
+ /** Validate the JavaEE 5.0 RI serial version uids against the current build
* @throws Exception
*/
- public void testJ2EERI141Compatibility()
+ public void testJavaEE50Compatibility()
throws Exception
{
- // The packages in j2ee 1.4.1RI with known serialization issues
+ // The packages to e excluded known serialization issues
String[] badPackages = {
- // The javax.mail binaries in the ri are not consistent with the javamail 1.3FCS
- "javax.mail",
- // upgrade to jboss-web 2.x
- "javax.servlet.ServletException",
- "javax.servlet.jsp.JspException",
- "javax.servlet.jsp.jstl.core.LoopTagSupport",
- "javax.servlet.jsp.tagext.TagSupport",
- // ?
- "javax.xml.bind.JAXBException",
- // ?
- "javax.xml.namespace.QName",
- // Upgrade JAXR: JBAS-5784/JAXR-6
- "javax.xml.registry.JAXRException",
- "javax.xml.registry.RegistryException"
+ // 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"
};
- System.out.println("+++ testJ2EERI141Compatibility");
+ System.out.println("+++ testJavaEER50Compatibility");
System.getProperties().remove("org.jboss.j2ee.LegacySerialization");
String etc = System.getProperty("jbosstest.src.etc", "../src/etc");
- File serFile = new File(etc, "serialVersionUID/j2ee141.ser");
+ File serFile = new File(etc, "serialVersionUID/javaee500.ser");
FileInputStream fis = new FileInputStream(serFile);
ObjectInputStream ois = new ObjectInputStream(fis);
Map classInfoMap = (Map) ois.readObject();
- System.out.println("J2EE RI serial classes count: "+classInfoMap.size());
+ System.out.println("JavaEE RI serial classes count: "+classInfoMap.size());
Map currentClassInfoMap = calcClassInfoMap();
- int mismatchCount = compare(classInfoMap, currentClassInfoMap, "J2EE1.4", badPackages);
+ int mismatchCount = compare(classInfoMap, currentClassInfoMap, "JavaEE5.0", badPackages);
currentClassInfoMap.clear();
System.out.println("serialVersionUID mismatches = "+mismatchCount);
assertTrue("There are no serialVersionUID mismatches("+mismatchCount+")",
@@ -206,11 +146,11 @@
{
ClassVersionInfo cvi = (ClassVersionInfo) iter.next();
String name = cvi.getName();
- ClassVersionInfo cvi401 = (ClassVersionInfo) classInfoMap.get(name);
- if( cvi401 != null && cvi.getSerialVersion() != cvi401.getSerialVersion() )
+ ClassVersionInfo cvi423 = (ClassVersionInfo) classInfoMap.get(name);
+ if( cvi423 != null && cvi.getSerialVersion() != cvi423.getSerialVersion() )
{
String msg = "serialVersionUID error for "+name
- +", " + versionName + " " + cvi401.getSerialVersion()
+ +", " + versionName + " " + cvi423.getSerialVersion()
+", current: "+cvi.getSerialVersion();
// Don't count classes from badPackages
boolean isInBadPkg = false;
@@ -254,8 +194,8 @@
// JBAS-3600, the execution order of tests in this test case is important
// so it must be defined explicitly when running under some JVMs
TestSuite suite = new TestSuite();
- //suite.addTest(new SerialVersionUIDUnitTestCase("test401Compatibility"));
- //suite.addTest(new SerialVersionUIDUnitTestCase("testJ2EERI141Compatibility"));
+ suite.addTest(new SerialVersionUIDUnitTestCase("test423Compatibility"));
+ //suite.addTest(new SerialVersionUIDUnitTestCase("testJavaEE50Compatibility"));
return suite;
}
Modified: trunk/testsuite/src/main/org/jboss/test/compatibility/test/matrix/MatrixTestContainer.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/compatibility/test/matrix/MatrixTestContainer.java 2008-12-03 18:22:36 UTC (rev 82016)
+++ trunk/testsuite/src/main/org/jboss/test/compatibility/test/matrix/MatrixTestContainer.java 2008-12-03 19:35:24 UTC (rev 82017)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
More information about the jboss-cvs-commits
mailing list