4 files changed, 17 insertions, 13 deletions
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/cpp/src/tests/MessagingSessionTests.cpp
index 91dad8f3f2..9c6f066d64 100644
--- a/cpp/src/tests/MessagingSessionTests.cpp
+++ b/cpp/src/tests/MessagingSessionTests.cpp
@@ -110,9 +110,18 @@ struct MessagingFixture : public BrokerFixture
 
     MessagingFixture(Broker::Options opts = Broker::Options()) :
         BrokerFixture(opts),
-        connection(Connection::open((boost::format("amqp:tcp:localhost:%1%") % (broker->getPort(Broker::TCP_TRANSPORT))).str())),
+        connection(open(broker->getPort(Broker::TCP_TRANSPORT))),
         session(connection.newSession()),
-        admin(broker->getPort(Broker::TCP_TRANSPORT)) {}
+        admin(broker->getPort(Broker::TCP_TRANSPORT))
+    {
+    }
+
+    static Connection open(uint16_t port)
+    {
+        Connection connection;
+        connection.open((boost::format("amqp:tcp:localhost:%1%") % (port)).str());
+        return connection;
+    }
 
     void ping(const qpid::messaging::Address& address)
     {
diff --git a/cpp/src/tests/qpid_recv.cpp b/cpp/src/tests/qpid_recv.cpp
index c45d76f91f..87a360ec0c 100644
--- a/cpp/src/tests/qpid_recv.cpp
+++ b/cpp/src/tests/qpid_recv.cpp
@@ -148,11 +148,8 @@ int main(int argc, char ** argv)
     Options opts;
     if (opts.parse(argc, argv)) {
         try {
-            Variant::Map connectionOptions;
-            if (opts.connectionOptions.size()) {
-                parseOptionString(opts.connectionOptions, connectionOptions);
-            }
-            Connection connection =  Connection::open(opts.url, connectionOptions);
+            Connection connection(opts.connectionOptions);
+            connection.open(opts.url);
             Session session = connection.newSession(opts.tx > 0);
             Receiver receiver = session.createReceiver(opts.address);
             receiver.setCapacity(opts.capacity);
diff --git a/cpp/src/tests/qpid_send.cpp b/cpp/src/tests/qpid_send.cpp
index c58d5fa10b..9556fb000f 100644
--- a/cpp/src/tests/qpid_send.cpp
+++ b/cpp/src/tests/qpid_send.cpp
@@ -180,11 +180,8 @@ int main(int argc, char ** argv)
     Options opts;
     if (opts.parse(argc, argv)) {
         try {
-            Variant::Map connectionOptions;
-            if (opts.connectionOptions.size()) {
-                parseOptionString(opts.connectionOptions, connectionOptions);
-            }
-            Connection connection =  Connection::open(opts.url, connectionOptions);
+            Connection connection(opts.connectionOptions);
+            connection.open(opts.url);
             Session session = connection.newSession(opts.tx > 0);
             Sender sender = session.createSender(opts.address);
             Message msg;
diff --git a/cpp/src/tests/qpid_stream.cpp b/cpp/src/tests/qpid_stream.cpp
index 8195bf390e..3cc8e70809 100644
--- a/cpp/src/tests/qpid_stream.cpp
+++ b/cpp/src/tests/qpid_stream.cpp
@@ -72,7 +72,8 @@ struct Client : Runnable
     void run()
     {
         try {
-            Connection connection = Connection::open(opts.url);
+            Connection connection;
+            connection.open(opts.url);
             Session session = connection.newSession();
             doWork(session);
             session.close();