You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/01 20:37:22 UTC
svn commit: r418496 - in /incubator/activemq/trunk/activemq-core: ./
src/test/java/org/apache/activemq/openwire/
src/test/resources/openwire-control/
Author: chirino
Date: Sat Jul 1 11:37:22 2006
New Revision: 418496
URL: http://svn.apache.org/viewvc?rev=418496&view=rev
Log:
Fixed ItStillMarshallsTheSameTest
Added:
incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin (with props)
incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin (with props)
Removed:
incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.BrokerInfoData.bin
incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.activemq.openwire.WireFormatInfoData.bin
Modified:
incubator/activemq/trunk/activemq-core/project.xml
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
Modified: incubator/activemq/trunk/activemq-core/project.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/project.xml?rev=418496&r1=418495&r2=418496&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/project.xml (original)
+++ incubator/activemq/trunk/activemq-core/project.xml Sat Jul 1 11:37:22 2006
@@ -341,13 +341,9 @@
<!-- These are performance tests so take too long to run -->
<exclude>**/perf/*</exclude>
-
<!-- these tests don't always work when rendezvous can't work on the OSS -->
<exclude>**/RendezvousDiscoverTransportTest.*</exclude>
- <!-- This test currently fails -->
- <exclude>**/ItStillMarshallsTheSameTest.*</exclude>
-
<!-- Kaha in flux - removing tests -->
<exclude>**/KahaXARecoveryBrokerTest.*</exclude>
<exclude>**/KahaRecoveryBrokerTest.*</exclude>
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java?rev=418496&r1=418495&r2=418496&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGenerator.java Sat Jul 1 11:37:22 2006
@@ -24,35 +24,19 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import junit.framework.Assert;
abstract public class DataFileGenerator extends Assert {
-
- private static final Log log = LogFactory.getLog(DataFileGenerator.class);
static final File moduleBaseDir;
static final File controlDir;
static final File classFileDir;
static {
- File basedir=null;
- try {
- URL resource = DataFileGenerator.class.getResource("DataFileGenerator.class");
- URI baseURI = new URI(resource.toString()).resolve("../../../../..");
- basedir = new File(baseURI).getCanonicalFile();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- moduleBaseDir = basedir;
+ moduleBaseDir = new File(System.getProperty("basedir", "."));
controlDir = new File(moduleBaseDir, "src/test/resources/openwire-control");
classFileDir = new File(moduleBaseDir, "src/test/java/org/apache/activemq/openwire");
}
@@ -69,7 +53,7 @@
* @throws IllegalAccessException
*/
public static ArrayList getAllDataFileGenerators() throws Exception{
- log.info("Looking for generators in : "+classFileDir);
+ System.out.println("Looking for generators in : "+classFileDir);
ArrayList l = new ArrayList();
File[] files = classFileDir.listFiles();
for (int i = 0; files!=null && i < files.length; i++) {
@@ -89,10 +73,10 @@
for (Iterator iter = generators.iterator(); iter.hasNext();) {
DataFileGenerator object = (DataFileGenerator) iter.next();
try {
- log.info("Processing: "+object.getClass());
+ System.out.println("Processing: "+object.getClass());
object.generateControlFile();
} catch (Exception e) {
- log.error("Error while processing: "+object.getClass() + ". Reason: " + e, e);
+ System.err.println("Error while processing: "+object.getClass() + ". Reason: " + e);
}
}
}
@@ -130,7 +114,7 @@
ArrayList generators = getAllDataFileGenerators();
for (Iterator iter = generators.iterator(); iter.hasNext();) {
DataFileGenerator object = (DataFileGenerator) iter.next();
- log.info("Processing: "+object.getClass());
+ System.out.println("Processing: "+object.getClass());
object.assertControlFileIsEqual();
}
}
Added: incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin?rev=418496&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.BrokerInfoData.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin?rev=418496&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/activemq/trunk/activemq-core/src/test/resources/openwire-control/org.apache.activemq.openwire.WireFormatInfoData.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream