diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-06-18 21:03:12 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-06-18 21:03:12 +0000 |
| commit | d3ba25a6c0ad0b8bce0482694152bcaed206af7b (patch) | |
| tree | 233f04f0ddc7be138529d863020bb8b5ecefd7de /java/systests | |
| parent | df6defeb2e0499ac80b69e7b7fb8944175447a02 (diff) | |
| download | qpid-python-d3ba25a6c0ad0b8bce0482694152bcaed206af7b.tar.gz | |
made test ports configurable; this required adding variable expansion to PropertiesFileInitialContextFactory
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@786269 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/systests')
3 files changed, 4 insertions, 4 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java index 39ecf0a209..8a9aee94dd 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java @@ -92,7 +92,7 @@ public class UTF8Test extends QpidTestCase Connection conn = new Connection(); if (!_broker.equals(QpidTestCase.EXTERNAL) && !isBroker08()) { - conn.connect("localhost", 5672, "test", "guest", "guest",false); + conn.connect("localhost", QpidTestCase.DEFAULT_PORT, "test", "guest", "guest",false); } else { diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java index b185ec60a2..1e172be855 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java @@ -26,7 +26,7 @@ public class FailoverBaseCase extends QpidTestCase { public static int FAILING_VM_PORT = 2; - public static int FAILING_PORT = 5673; + public static int FAILING_PORT = DEFAULT_PORT + 1; protected int failingPort; diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index bd481df8a0..a28e1181fe 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -148,8 +148,8 @@ public class QpidTestCase extends TestCase private static final String QPID_HOME = "QPID_HOME"; - protected int DEFAULT_VM_PORT = 1; - protected int DEFAULT_PORT = 5672; + protected static int DEFAULT_VM_PORT = 1; + protected static int DEFAULT_PORT = Integer.getInteger("test.port", 5672); protected String _brokerLanguage = System.getProperty(BROKER_LANGUAGE, JAVA); protected String _broker = System.getProperty(BROKER, VM); |