diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2008-03-03 16:28:36 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2008-03-03 16:28:36 +0000 |
| commit | 0eadb79ee82aadfc6fa6d2b81aa483cf3f62d7d4 (patch) | |
| tree | 3db263799566131a4c6f3bbcb9b9eec63f0dd2ac /java/client/src | |
| parent | 79af556e23ff02c660abee6ff9f1f0aa278b1d87 (diff) | |
| download | qpid-python-0eadb79ee82aadfc6fa6d2b81aa483cf3f62d7d4.tar.gz | |
QPID-784 : Minor changes based on code comments by ASkinner and RGodfrey.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@633160 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java | 6 | ||||
| -rw-r--r-- | java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java index 572ea48f85..f3e71d2035 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java @@ -57,9 +57,9 @@ public class AMQBrokerDetails implements BrokerDetails if (transport != null) { //todo this list of valid transports should be enumerated somewhere - if ((!(transport.equalsIgnoreCase("vm") || - transport.equalsIgnoreCase("tcp") || - transport.equalsIgnoreCase("socket")))) + if ((!(transport.equalsIgnoreCase(BrokerDetails.VM) || + transport.equalsIgnoreCase(BrokerDetails.TCP) || + transport.equalsIgnoreCase(BrokerDetails.SOCKET)))) { if (transport.equalsIgnoreCase("localhost")) { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java index 978ce34d59..d90873a6a7 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java @@ -512,7 +512,7 @@ public class ConnectionURLTest extends TestCase public void testSocketProtocol() throws URLSyntaxException { - String url = "amqp://guest:guest@id/test" + "?brokerlist='socket:///'"; + String url = "amqp://guest:guest@id/test" + "?brokerlist='socket://VM-Unique-socketID'"; try { @@ -520,7 +520,9 @@ public class ConnectionURLTest extends TestCase assertNotNull(curl); assertEquals(1, curl.getBrokerCount()); assertNotNull(curl.getBrokerDetails(0)); - assertEquals("socket", curl.getBrokerDetails(0).getTransport()); + assertEquals(BrokerDetails.SOCKET, curl.getBrokerDetails(0).getTransport()); + assertEquals("VM-Unique-socketID", curl.getBrokerDetails(0).getHost()); + assertEquals("URL does not toString as expected", url, curl.toString()); } catch (URLSyntaxException e) { |