From 5f7116bbba781af8910a2bed9e842aa2839b3d96 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Fri, 17 Jul 2009 11:53:43 +0000 Subject: added system properties for controlling the module locations used during test runs; concat all the profile properties together before loading so that more can be shared between profiles; added an @SSL_PORT to the substitutions done by QpidTestCase git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@795056 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/qpid/test/utils/QpidTestCase.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'qpid/java/systests/src') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 892b80896c..735aa4b1de 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -344,19 +344,11 @@ public class QpidTestCase extends TestCase private String getBrokerCommand(int port) throws MalformedURLException { - if (_brokerLanguage.equals(JAVA)) - { - return _broker - .replace("@PORT", "" + port) - .replace("@MPORT", "" + (port + (8999 - DEFAULT_PORT))) - .replace("@CONFIG_FILE", _configFile.toString()); - } - else - { - return _broker - .replace("@PORT", "" + port) - .replace("@MPORT", "" + (port + (8999 - DEFAULT_PORT))); - } + return _broker + .replace("@PORT", "" + port) + .replace("@SSL_PORT", "" + (port - 1)) + .replace("@MPORT", "" + (port + (8999 - DEFAULT_PORT))) + .replace("@CONFIG_FILE", _configFile.toString()); } public void startBroker(int port) throws Exception -- cgit v1.2.1