[jboss-svn-commits] JBL Code SVN: r31936 - in labs/jbosstm/trunk/XTS/localjunit: src/com/arjuna/qa/junit and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 4 08:46:24 EST 2010
Author: adinn
Date: 2010-03-04 08:46:23 -0500 (Thu, 04 Mar 2010)
New Revision: 31936
Modified:
labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java
labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java
Log:
ensured test run output files from separate runs are not overwritten so as to be able to detect failres more easily
Modified: labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml 2010-03-04 13:45:01 UTC (rev 31935)
+++ labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml 2010-03-04 13:46:23 UTC (rev 31936)
@@ -22,9 +22,10 @@
<project name="Local JUnit Test for basic XTS testsuite" default="interop-tests" basedir=".">
<!-- this should be run from the installed tree i.e. <JBossTSDir>/XTS/xts-install/interop-tests-->
-
+ <!-- location of XTS root dir -->
+ <property name="root.dir" value="../.."/>
<!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../../.."/>
+ <property name="jbossts.dir" location="${root.dir}/.."/>
<!-- all libraries external to JBossTS should be found in parent build/extlib -->
<property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
<property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
@@ -50,20 +51,20 @@
<mkdir dir="${reports.dir}"/>
</target>
- <target name="interop-tests" depends="wstf-interop-tests,wstx11-interop-tests,init"/>
+ <target name="interop-tests" depends="init, wstf-interop-tests,wstx11-interop-tests"/>
<target name="wstf-interop-tests">
- <run-localjunit-test serverUrl="${base.url}/sc007/test?serviceuri=${base.url}/sc007/ParticipantService&testTimeout=120000&test=allTests&resultPage=/xmlresults" outfile="TEST-sc007-test.xml" />
+ <run-localjunit-test serverUrl="${base.url}/sc007/test?serviceuri=${base.url}/sc007/ParticipantService&testTimeout=120000&test=allTests&resultPage=/xmlresults" tag="sc007" />
</target>
<target name="wstx11-interop-tests">
- <run-localjunit-test serverUrl="${base.url}/interop11/test?serviceuri=${base.url}/interop11/ATParticipantService&testTimeout=120000&test=allATTests&resultPage=/xmlresults" outfile="TEST-interop11-AT-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/interop11/test?serviceuri=${base.url}/interop11/BAParticipantService&testTimeout=120000&test=allBATests&resultPage=/xmlresults" outfile="TEST-interop11-BA-test.xml" />
+ <run-localjunit-test serverUrl="${base.url}/interop11/test?serviceuri=${base.url}/interop11/ATParticipantService&testTimeout=120000&test=allATTests&resultPage=/xmlresults" tag="interop11-AT" />
+ <run-localjunit-test serverUrl="${base.url}/interop11/test?serviceuri=${base.url}/interop11/BAParticipantService&testTimeout=120000&test=allBATests&resultPage=/xmlresults" tag="interop11-BA" />
</target>
<macrodef name="run-localjunit-test">
<attribute name="serverUrl" />
- <attribute name="outfile" />
+ <attribute name="tag" />
<sequential>
<junit printsummary="yes" haltonfailure="no" fork="true" dir="." maxmemory="256m" showoutput="yes">
<classpath>
@@ -73,9 +74,9 @@
<formatter type="xml"/>
<sysproperty key="serverUrl" value="@{serverUrl}" />
- <sysproperty key="outfile" value="${reports.dir}/@{outfile}" />
+ <sysproperty key="outfile" value="${reports.dir}/Test-@{tag}-test.xml" />
- <test name="com.arjuna.qa.junit.LocalJUnitInteropRunner" />
+ <test name="com.arjuna.qa.junit.LocalJUnitInteropRunner" outfile="TEST-com.arjuna.qa.junit.LocalJUnitInteropRunner-@{tag}"/>
<!--jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/-->
Modified: labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2010-03-04 13:45:01 UTC (rev 31935)
+++ labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2010-03-04 13:46:23 UTC (rev 31936)
@@ -23,8 +23,10 @@
<!-- this should be run from the installed tree i.e. <JBossTSDir>/XTS/xts-install/tests -->
+ <!-- location of XTS root dir -->
+ <property name="root.dir" value="../.."/>
<!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../../.."/>
+ <property name="jbossts.dir" location="${root.dir}/.."/>
<!-- all libraries external to JBossTS should be found in parent build/extlib -->
<property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
<property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
@@ -50,24 +52,24 @@
<!-- target for 1.1 tests -->
<target name="tests-11" depends="init">
- <run-localjunit-test serverUrl="${base.url}/wsas-tests/index.xml" outfile="TEST-wsas-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/ws-c11-tests/index.xml" outfile="TEST-ws-c11-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/ws-t11-tests/index.xml" outfile="TEST-ws-t11-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/wscf11-tests/index.xml" outfile="TEST-wscf11-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/wstx11-tests/index.xml" outfile="TEST-wstx11-test.xml" />
+ <run-localjunit-test serverUrl="${base.url}/wsas-tests/index.xml" tag="wsas" />
+ <run-localjunit-test serverUrl="${base.url}/ws-c11-tests/index.xml" tag="ws-c11" />
+ <run-localjunit-test serverUrl="${base.url}/ws-t11-tests/index.xml" tag="ws-t11" />
+ <run-localjunit-test serverUrl="${base.url}/wscf11-tests/index.xml" tag="wscf11" />
+ <run-localjunit-test serverUrl="${base.url}/wstx11-tests/index.xml" tag="wstx11" />
</target>
<!-- target for both 1.0 and 1.1 tests -->
<target name="tests-both" depends="tests-11">
- <run-localjunit-test serverUrl="${base.url}/wscf-tests/index.xml" outfile="TEST-wscf-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/wstx-tests/index.xml" outfile="TEST-wstx-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/ws-c-tests/index.xml" outfile="TEST-ws-c-test.xml" />
- <run-localjunit-test serverUrl="${base.url}/ws-t-tests/index.xml" outfile="TEST-ws-t-test.xml" />
+ <run-localjunit-test serverUrl="${base.url}/wscf-tests/index.xml" tag="wscf" />
+ <run-localjunit-test serverUrl="${base.url}/wstx-tests/index.xml" tag="wstx" />
+ <run-localjunit-test serverUrl="${base.url}/ws-c-tests/index.xml" tag="ws-c" />
+ <run-localjunit-test serverUrl="${base.url}/ws-t-tests/index.xml" tag="ws-t" />
</target>
<macrodef name="run-localjunit-test">
<attribute name="serverUrl" />
- <attribute name="outfile" />
+ <attribute name="tag" />
<sequential>
<junit printsummary="yes" haltonfailure="no" fork="true" dir="." maxmemory="256m" showoutput="yes">
<classpath>
@@ -77,9 +79,9 @@
<formatter type="xml"/>
<sysproperty key="serverUrl" value="@{serverUrl}" />
- <sysproperty key="outfile" value="${reports.dir}/@{outfile}" />
+ <sysproperty key="outfile" value="${reports.dir}/TEST-@{tag}-test.xml" />
- <test name="com.arjuna.qa.junit.LocalJUnitRunner" />
+ <test name="com.arjuna.qa.junit.LocalJUnitRunner" outfile="TEST-com.arjuna.qa.junit.LocalJUnitRunner-@{tag}"/>
<!--jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/-->
Modified: labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java 2010-03-04 13:45:01 UTC (rev 31935)
+++ labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitInteropRunner.java 2010-03-04 13:46:23 UTC (rev 31936)
@@ -54,6 +54,9 @@
}
catch (Exception e)
{
+ System.err.println("======================================================");
+ System.err.println("==================== EXCEPTION =====================");
+ System.err.println("======================================================");
e.printStackTrace();
result = false;
}
Modified: labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java 2010-03-04 13:45:01 UTC (rev 31935)
+++ labs/jbosstm/trunk/XTS/localjunit/src/com/arjuna/qa/junit/LocalJUnitRunner.java 2010-03-04 13:46:23 UTC (rev 31936)
@@ -4,6 +4,7 @@
import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.Header;
+import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.io.FileWriter;
@@ -79,6 +80,9 @@
}
catch (Exception e)
{
+ System.err.println("======================================================");
+ System.err.println("==================== EXCEPTION =====================");
+ System.err.println("======================================================");
e.printStackTrace();
result = false;
}
More information about the jboss-svn-commits
mailing list