summaryrefslogtreecommitdiff
path: root/qpid/java/systests/src
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2009-06-18 21:03:12 +0000
committerRafael H. Schloming <rhs@apache.org>2009-06-18 21:03:12 +0000
commit0ac0ba5e1d146a133abbd1ea0ddcabe6d25ab987 (patch)
tree0d65318b1d4b1ff9eef825c31e6113d334146871 /qpid/java/systests/src
parentc2e8e0f59377b04019decbe2eb6c6f3db634b988 (diff)
downloadqpid-python-0ac0ba5e1d146a133abbd1ea0ddcabe6d25ab987.tar.gz
made test ports configurable; this required adding variable expansion to PropertiesFileInitialContextFactory
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@786269 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java2
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java2
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
index 39ecf0a209..8a9aee94dd 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/UTF8Test.java
+++ b/qpid/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/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
index b185ec60a2..1e172be855 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
+++ b/qpid/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/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 bd481df8a0..a28e1181fe 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
@@ -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);