Altered test case 2, i.e. basic p2p, such that it binds the queue to amq.direct rather than relying on the default bindings.

Modified the clientid option of the test runner to be -n,--clientname to be consistent with java test runner. 



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

2 files changed, 3 insertions, 1 deletions

diff --git a/cpp/tests/BasicP2PTest.h b/cpp/tests/BasicP2PTest.h
index f38ea2c387..989344bb47 100644
--- a/cpp/tests/BasicP2PTest.h
+++ b/cpp/tests/BasicP2PTest.h
@@ -50,6 +50,8 @@ class BasicP2PTest : public SimpleTestCaseBase
         {
             Queue q(queue, true);
             channel.declareQueue(q);
+            framing::FieldTable args;
+            channel.bind(Exchange::STANDARD_DIRECT_EXCHANGE, q, queue, args);
             channel.consume(q, tag, this);
             channel.start();
         }
diff --git a/cpp/tests/TestOptions.h b/cpp/tests/TestOptions.h
index 6cf6314bca..7031efc266 100644
--- a/cpp/tests/TestOptions.h
+++ b/cpp/tests/TestOptions.h
@@ -35,7 +35,7 @@ struct TestOptions : public qpid::CommonOptions
         desc.add_options()
             ("broker,b", optValue(broker, "HOSTNAME"), "the hostname to connect to")
             ("virtualhost,v", optValue(virtualhost, "VIRTUAL_HOST"), "virtual host")
-            ("clientid,i", optValue(clientid, "ID"), "unique client identifier")
+            ("clientname,n", optValue(clientid, "ID"), "unique client identifier")
             ("help,h", optValue(help), "print this usage statement");
     }