1 files changed, 46 insertions, 39 deletions

diff --git a/qpid/cpp/src/tests/qpid-ping.cpp b/qpid/cpp/src/tests/qpid-ping.cpp
index 52331499e7..f9b1ec17f1 100644
--- a/qpid/cpp/src/tests/qpid-ping.cpp
+++ b/qpid/cpp/src/tests/qpid-ping.cpp
@@ -20,68 +20,75 @@
 
  */
 
-#include "TestOptions.h"
-#include "qpid/client/SubscriptionManager.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/AsyncSession.h"
-#include "qpid/sys/Time.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/framing/Uuid.h"
+#include <qpid/messaging/Address.h>
+#include <qpid/messaging/Connection.h>
+#include "qpid/messaging/Duration.h"
+#include <qpid/messaging/Message.h>
+#include <qpid/messaging/Sender.h>
+#include <qpid/messaging/Receiver.h>
+#include <qpid/messaging/Session.h>
+#include <qpid/Msg.h>
+#include <qpid/Options.h>
+#include <qpid/types/Uuid.h>
 #include <string>
 #include <iostream>
 
-using std::cerr;
-using std::cout;
-using std::endl;
-using std::exception;
-using std::string;
-using namespace qpid::client::arg; // For keyword args
-using qpid::client::AsyncSession;
-using qpid::client::Connection;
-using qpid::client::Message;
-using qpid::client::SubscriptionManager;
-using qpid::framing::Uuid;
+using namespace std;
+using namespace qpid::messaging;
+using qpid::types::Uuid;
 
-namespace qpid {
-namespace tests {
+namespace {
 
-struct PingOptions : public qpid::TestOptions {
-    int timeout;                // Timeout in seconds.
+struct PingOptions : public qpid::Options {
+    string url;
+    string address;
+    string message;
+    string connectionOptions;
+    double timeout;             // Timeout in seconds.
     bool quiet;                 // No output
-    PingOptions() : timeout(1), quiet(false) {
+
+    PingOptions() :
+        url("127.0.0.1"),
+        address(Uuid(true).str()+";{create:always}"),
+        message(Uuid(true).str()),
+        timeout(1),
+        quiet(false)
+    {
+        using qpid::optValue;
         addOptions()
+            ("broker,b", qpid::optValue(url, "URL"), "url of broker to connect to.")
+            ("address,a", qpid::optValue(address, "ADDRESS"), "address to use.")
+            ("message,m", optValue(message, "MESSAGE"), "message text to send.")
+            ("connection-options", optValue(connectionOptions, "OPTIONS"), "options for the connection.")
             ("timeout,t", optValue(timeout, "SECONDS"), "Max time to wait.")
             ("quiet,q", optValue(quiet), "Don't print anything to stderr/stdout.");
     }
 };
 
-}} // namespace qpid::tests
+} // namespace
 
 int main(int argc, char** argv) {
+    Connection connection;
+    PingOptions opts;
     try {
-        qpid::tests::PingOptions opts;
         opts.parse(argc, argv);
-        opts.con.heartbeat = (opts.timeout+1)/2;
-        Connection connection;
-        opts.open(connection);
+        connection = Connection(opts.url, opts.connectionOptions);
+        connection.open();
         if (!opts.quiet) cout << "Opened connection." << endl;
-        AsyncSession s = connection.newSession();
-        string qname(Uuid(true).str());
-        s.queueDeclare(queue=qname, autoDelete=true, exclusive=true);
-        s.messageTransfer(content=Message("hello", qname));
+        Session s = connection.createSession();
+        s.createSender(opts.address).send(Message(opts.message));
         if (!opts.quiet) cout << "Sent message." << endl;
-        SubscriptionManager subs(s);
-        subs.get(qname);
+        Message m = s.createReceiver(opts.address).
+            fetch(Duration(opts.timeout*1000));
+        if (m.getContent() != opts.message)
+            throw qpid::Exception(qpid::Msg() << "Expected " << opts.message
+                                  << " but received " << m.getContent());
         if (!opts.quiet) cout << "Received message." << endl;
-        s.sync();
-        s.close();
         connection.close();
-        if (!opts.quiet) cout << "Success." << endl;
         return 0;
     } catch (const exception& e) {
         cerr << "Error: " << e.what() << endl;
+        connection.close();
         return 1;
     }
 }