[jboss-cvs] JBoss Messaging SVN: r2351 - in trunk: tests and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 19 12:47:16 EST 2007
Author: clebert.suconic at jboss.com
Date: 2007-02-19 12:47:16 -0500 (Mon, 19 Feb 2007)
New Revision: 2351
Removed:
trunk/tests/src/org/jboss/test/messaging/tools/ant/XMLJUnitMultipleResultFormatter.java
Modified:
trunk/build-thirdparty.xml
trunk/tests/build.xml
Log:
replace JUnit formater from the one on jboss-test library
Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml 2007-02-19 15:24:55 UTC (rev 2350)
+++ trunk/build-thirdparty.xml 2007-02-19 17:47:16 UTC (rev 2351)
@@ -84,16 +84,19 @@
<componentref name="sun-javacc" version="3.2"/>
<componentref name="oswego-concurrent" version="1.3.4"/>
<componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="javassist" version="3.2.0.GA"/>
+ <componentref name="javassist" version="3.3.0.GA"/>
<componentref name="jgroups" version="2.4.1"/>
<componentref name="trove" version="1.0.2"/>
<componentref name="jboss/common-core" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
- <componentref name="jboss/aop" version="1.5.0.GA"/>
+ <componentref name="jboss/aop" version="1.5.3.GA"/>
<componentref name="jboss/serialization" version="1.0.3.GA"/>
<componentref name="jboss/remoting" version="2.2.0.Alpha7"/>
<componentref name="jboss/jbossts" version="4.2.2.GA"/>
+ <componentref name="jboss/test14" version="snapshot"/>
+ <componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
+ <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<!-- Need this otherwise project doesn't build in Eclipse -->
<componentref name="apache-logging" version="1.0.4.1jboss"/>
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-02-19 15:24:55 UTC (rev 2350)
+++ trunk/tests/build.xml 2007-02-19 17:47:16 UTC (rev 2351)
@@ -180,6 +180,8 @@
<path refid="jboss.server.classpath"/> <!-- for org.jboss.jms.jndi.JNDIProviderAdapter -->
<path refid="jboss.jca.classpath"/> <!-- for org.jboss.resource.adapter.jdbc.local.LocalManagedConnectionFactory, etc -->
<path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss.test14.classpath"/>
+ <path refid="jboss.jbossretro.rt.classpath"/>
</path>
<!--
@@ -206,6 +208,8 @@
<path refid="postgres.jdbc.driver.classpath"/>
<path refid="apache.tomcat.classpath"/>
<path refid="apache.logging.classpath"/>
+ <path refid="jboss.test14.classpath"/>
+ <path refid="jboss.jbossretro.rt.classpath"/>
</path>
<path id="stress.test.execution.classpath">
@@ -554,8 +558,8 @@
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
-->
<classpath refid="stress.test.execution.classpath"/>
- <sysproperty key="messaging-test-configuration" value="StressInVM"/>
- <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
+ <sysproperty key="jboss-junit-configuration" value="StressInVM"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}" extension="-StressInVM.xml"/>
<batchtest fork="${junit.batchtest.fork}"
todir="${junit.batchtest.todir}"
@@ -603,22 +607,10 @@
-->
<classpath>
<path refid="test.execution.classpath"/>
-
- <!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
- <!--
- <path refid="jboss.test.classpath"/>
- -->
</classpath>
- <!-- Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
- <!--
- <sysproperty key="jboss-junit-configuration" value="Remote"/>
+ <sysproperty key="jboss-junit-configuration" value="Remote-${test.remoting}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
- -->
-
- <sysproperty key="messaging-test-configuration" value="Remote-${test.remoting}"/>
- <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}" extension="-Remote-${test.remoting}.xml"/>
<batchtest fork="${junit.batchtest.fork}"
@@ -686,21 +678,10 @@
<!-- <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=unittest"/> -->
<classpath>
<path refid="stress.test.execution.classpath"/>
- <!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
- <!--
- <path refid="jboss.test.classpath"/>
- -->
</classpath>
- <!-- Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
- <!--
- <sysproperty key="jboss-junit-configuration" value="Remote"/>
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
- -->
-
- <sysproperty key="messaging-test-configuration" value="StressRemote-${test.remoting}"/>
- <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
+ <sysproperty key="jboss-junit-configuration" value="StressRemote-${test.remoting}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatte"
usefile="${junit.formatter.usefile}" extension="-StressRemote-${test.remoting}.xml"/>
<batchtest fork="${junit.batchtest.fork}"
@@ -827,25 +808,10 @@
<classpath>
<path refid="test.execution.classpath"/>
- <!--
- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done
- -->
- <!--
- <path refid="jboss.test.classpath"/>
- -->
</classpath>
- <!--
- Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done
- -->
- <!--
- <sysproperty key="jboss-junit-configuration" value="Remote"/>
+ <sysproperty key="jboss-junit-configuration" value="Clustering"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
- -->
-
- <sysproperty key="messaging-test-configuration" value="Clustering"/>
- <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}" extension="-Clustering.xml"/>
<batchtest fork="${junit.batchtest.fork}"
@@ -913,25 +879,10 @@
<classpath>
<path refid="test.execution.classpath"/>
- <!--
- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done
- -->
- <!--
- <path refid="jboss.test.classpath"/>
- -->
</classpath>
- <!--
- Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done
- -->
- <!--
- <sysproperty key="jboss-junit-configuration" value="Remote"/>
+ <sysproperty key="jboss-junit-configuration" value="Clustering"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
- -->
-
- <sysproperty key="messaging-test-configuration" value="Clustering"/>
- <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}" extension="-Clustering.xml"/>
<batchtest fork="${junit.batchtest.fork}"
@@ -1137,22 +1088,10 @@
-->
<classpath>
<path refid="test.execution.classpath"/>
-
- <!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
- <!--
- <path refid="jboss.test.classpath"/>
- -->
</classpath>
- <!-- Use this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
- <!--
- <sysproperty key="jboss-junit-configuration" value="Remote"/>
+ <sysproperty key="jboss-junit-configuration" value="Crash-${test.remoting}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
- usefile="${junit.formatter.usefile}" extension="-Remote.xml"/>
- -->
-
- <sysproperty key="messaging-test-configuration" value="Crash-${test.remoting}"/>
- <formatter classname="org.jboss.test.messaging.tools.ant.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}" extension="-Crash-${test.remoting}.xml"/>
<test name="${crash.test.name}"
Deleted: trunk/tests/src/org/jboss/test/messaging/tools/ant/XMLJUnitMultipleResultFormatter.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ant/XMLJUnitMultipleResultFormatter.java 2007-02-19 15:24:55 UTC (rev 2350)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ant/XMLJUnitMultipleResultFormatter.java 2007-02-19 17:47:16 UTC (rev 2351)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, 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.messaging.tools.ant;
-
-
-import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
-import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
-
-/**
- * TODO Deprecate this and use org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter nstead
- * when http://jira.jboss.org/jira/browse/JBAS-2554 is done
- *
- * This class only serves the proposite of keep multiple JUnit runnings between different
- * configurations. For example, if you run a testcase as cluster, and the same testcase as
- * singlenode, we want to keep both results in the JUnitReport. This is a simple implementation
- * that uses a variable defined jboss-configuration and put that as part of the name.
- *
- * @author Clebert Suconic
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
- *
- * $Id$
- */
-public class XMLJUnitMultipleResultFormatter extends XMLJUnitResultFormatter
-{
-
- public void startTestSuite(JUnitTest test)
- {
- String configuration = (String)System.getProperties().get("messaging-test-configuration");
-
- if (configuration != null && !configuration.trim().equals(""))
- {
- test.setName(test.getName() + "(" + configuration + ")");
- }
-
- super.startTestSuite(test);
- }
-
-}
More information about the jboss-cvs-commits
mailing list