Qpid-709: nolocal test was failing because the inVM connections were not created with a new connection ID.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@604926 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 16 insertions, 1 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 31862cf5c1..3479dfae03 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -339,7 +339,7 @@ public class TopicSessionTest extends QpidTestCase
         m = (TextMessage) noLocal.receive(100);
         assertNull(m);
 
-        AMQConnection con2 = (AMQConnection) getConnection("guest", "guest");
+        AMQConnection con2 = (AMQConnection) getConnection("guest", "guest", "foo");
         TopicSession session2 = con2.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
         TopicPublisher publisher2 = session2.createPublisher(topic);
 
diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
index ca9bdee514..094790fb7e 100644
--- a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
+++ b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
@@ -238,4 +238,19 @@ public class QpidTestCase extends TestCase
         }
         return con;
     }
+
+     public Connection getConnection(String username, String password, String id) throws Exception
+    {
+        _logger.info("get Connection");
+        Connection con;
+        if (_shel.equals(BROKER_VM))
+        {
+            con = new AMQConnection("vm://:1", username, password, id, "test");
+        }
+        else
+        {
+            con = getConnectionFactory().createConnection(username, password);
+        }
+        return con;
+    }
 }