summaryrefslogtreecommitdiff
path: root/java/integrationtests
diff options
context:
space:
mode:
authorRupert Smith <rupertlssmith@apache.org>2007-05-14 11:47:13 +0000
committerRupert Smith <rupertlssmith@apache.org>2007-05-14 11:47:13 +0000
commit72197a8f0b5b39c7931d0a85fdd2426115456acb (patch)
tree79c4a7bc4a8c75c5e36f0f98c88195f3e00e33c1 /java/integrationtests
parent736eb917ebd8a1a007dde5af12257b390ae40108 (diff)
downloadqpid-python-72197a8f0b5b39c7931d0a85fdd2426115456acb.tar.gz
Merged revisions 536571-536583,536586-536823,536825-537014,537016-537018,537020-537025,537027-537028,537030-537160,537162-537170,537172-537672,537674-537782 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r536571 | ritchiem | 2007-05-09 16:46:57 +0100 (Wed, 09 May 2007) | 1 line QPID-484 Provided default GC and easy customisation.. via setting QPID_JAVA_QC. ........ r536573 | rgreig | 2007-05-09 16:48:11 +0100 (Wed, 09 May 2007) | 1 line Corrected mistaked in test parameters. ........ r537782 | rupertlssmith | 2007-05-14 12:37:41 +0100 (Mon, 14 May 2007) | 1 line Added to the Javadoc. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@537789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/integrationtests')
-rw-r--r--java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java2
-rw-r--r--java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java b/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
index ef69d14be8..3003c00ca5 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
+++ b/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/CoordinatingTestCase.java
@@ -35,7 +35,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.util.ConversationFactory;
/**
- * An CoordinatingTestCase is a JUnit test case extension that knows how to coordinate test clients that take part in a
+ * A CoordinatingTestCase is a JUnit test case extension that knows how to coordinate test clients that take part in a
* test case as defined in the interop testing specification
* (http://cwiki.apache.org/confluence/display/qpid/Interop+Testing+Specification).
*
diff --git a/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java b/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java
index de5faeac0f..2f9937cae9 100644
--- a/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java
+++ b/java/integrationtests/src/main/java/org/apache/qpid/interop/coordinator/Coordinator.java
@@ -134,6 +134,7 @@ public class Coordinator extends TKTestRunner
String brokerUrl = options.getProperty("b");
String virtualHost = options.getProperty("h");
reportDir = options.getProperty("o");
+ reportDir = (reportDir == null) ? "." : reportDir;
// Scan for available test cases using a classpath scanner.
Collection<Class<? extends CoordinatingTestCase>> testCaseClasses =