diff options
Diffstat (limited to 'cpp/src/tests/MessagingSessionTests.cpp')
| -rw-r--r-- | cpp/src/tests/MessagingSessionTests.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/cpp/src/tests/MessagingSessionTests.cpp index 00a8481c93..6d7f45bc0a 100644 --- a/cpp/src/tests/MessagingSessionTests.cpp +++ b/cpp/src/tests/MessagingSessionTests.cpp @@ -248,7 +248,7 @@ QPID_AUTO_TEST_CASE(testSenderError) MessagingFixture fix; ScopedSuppressLogging sl; BOOST_CHECK_THROW(fix.session.createSender("NonExistentAddress"), qpid::messaging::InvalidAddress); - BOOST_CHECK_THROW(fix.session.createSender("NonExistentAddress {create:receiver, type:queue}"), + BOOST_CHECK_THROW(fix.session.createSender("NonExistentAddress; {create:receiver, type:queue}"), qpid::messaging::InvalidAddress); } @@ -257,7 +257,7 @@ QPID_AUTO_TEST_CASE(testReceiverError) MessagingFixture fix; ScopedSuppressLogging sl; BOOST_CHECK_THROW(fix.session.createReceiver("NonExistentAddress"), qpid::messaging::InvalidAddress); - BOOST_CHECK_THROW(fix.session.createReceiver("NonExistentAddress {create:sender, type:queue}"), + BOOST_CHECK_THROW(fix.session.createReceiver("NonExistentAddress; {create:sender, type:queue}"), qpid::messaging::InvalidAddress); } @@ -466,9 +466,9 @@ QPID_AUTO_TEST_CASE(testBrowse) QueueFixture fix; Sender sender = fix.session.createSender(fix.queue); send(sender, 10); - Receiver browser1 = fix.session.createReceiver(fix.queue + " {browse:true}"); + Receiver browser1 = fix.session.createReceiver(fix.queue + "; {browse:true}"); receive(browser1, 10); - Receiver browser2 = fix.session.createReceiver(fix.queue + " {browse:true}"); + Receiver browser2 = fix.session.createReceiver(fix.queue + "; {browse:true}"); receive(browser2, 10); Receiver consumer = fix.session.createReceiver(fix.queue); receive(consumer, 10); @@ -495,13 +495,13 @@ struct QueueCreatePolicyFixture : public MessagingFixture QPID_AUTO_TEST_CASE(testCreatePolicyQueueAlways) { - QueueCreatePolicyFixture fix("# {create:always, type:queue}"); + QueueCreatePolicyFixture fix("#; {create:always, type:queue}"); fix.test(); } QPID_AUTO_TEST_CASE(testCreatePolicyQueueReceiver) { - QueueCreatePolicyFixture fix("# {create:receiver, type:queue}"); + QueueCreatePolicyFixture fix("#; {create:receiver, type:queue}"); Receiver r = fix.session.createReceiver(fix.address); fix.test(); r.cancel(); @@ -509,7 +509,7 @@ QPID_AUTO_TEST_CASE(testCreatePolicyQueueReceiver) QPID_AUTO_TEST_CASE(testCreatePolicyQueueSender) { - QueueCreatePolicyFixture fix("# {create:sender, type:queue}"); + QueueCreatePolicyFixture fix("#; {create:sender, type:queue}"); Sender s = fix.session.createSender(fix.address); fix.test(); s.cancel(); @@ -539,14 +539,14 @@ struct ExchangeCreatePolicyFixture : public MessagingFixture QPID_AUTO_TEST_CASE(testCreatePolicyTopic) { - ExchangeCreatePolicyFixture fix("# {create:always, type:topic, node-properties:{x-amqp0-10-exchange-type:topic}}", + ExchangeCreatePolicyFixture fix("#; {create:always, type:topic, node-properties:{x-amqp0-10-exchange-type:topic}}", "topic"); fix.test(); } QPID_AUTO_TEST_CASE(testCreatePolicyTopicReceiverFanout) { - ExchangeCreatePolicyFixture fix("#/my-subject {create:receiver, type:topic, node-properties:{x-amqp0-10-exchange-type:fanout}}", "fanout"); + ExchangeCreatePolicyFixture fix("#/my-subject; {create:receiver, type:topic, node-properties:{x-amqp0-10-exchange-type:fanout}}", "fanout"); Receiver r = fix.session.createReceiver(fix.address); fix.test(); r.cancel(); @@ -554,7 +554,7 @@ QPID_AUTO_TEST_CASE(testCreatePolicyTopicReceiverFanout) QPID_AUTO_TEST_CASE(testCreatePolicyTopicSenderDirect) { - ExchangeCreatePolicyFixture fix("#/my-subject {create:sender, type:topic, node-properties:{x-amqp0-10-exchange-type:direct}}", "direct"); + ExchangeCreatePolicyFixture fix("#/my-subject; {create:sender, type:topic, node-properties:{x-amqp0-10-exchange-type:direct}}", "direct"); Sender s = fix.session.createSender(fix.address); fix.test(); s.cancel(); @@ -594,7 +594,7 @@ struct DeletePolicyFixture : public MessagingFixture void test(Mode mode) { - qpid::messaging::Address address("# " + getPolicy(mode)); + qpid::messaging::Address address("#; " + getPolicy(mode)); create(address); Sender s = session.createSender(address); @@ -681,18 +681,18 @@ QPID_AUTO_TEST_CASE(testDeletePolicyExchange) QPID_AUTO_TEST_CASE(testAssertPolicyQueue) { MessagingFixture fix; - std::string a1 = "q {create:always, assert:always, type:queue, node-properties:{durable:false, x-amqp0-10-arguments:{qpid.max-count:100}}}"; + std::string a1 = "q; {create:always, assert:always, type:queue, node-properties:{durable:false, x-amqp0-10-arguments:{qpid.max-count:100}}}"; Sender s1 = fix.session.createSender(a1); s1.cancel(); Receiver r1 = fix.session.createReceiver(a1); r1.cancel(); - std::string a2 = "q {assert:receiver, node-properties:{durable:true, x-amqp0-10-arguments:{qpid.max-count:100}}}"; + std::string a2 = "q; {assert:receiver, node-properties:{durable:true, x-amqp0-10-arguments:{qpid.max-count:100}}}"; Sender s2 = fix.session.createSender(a2); s2.cancel(); BOOST_CHECK_THROW(fix.session.createReceiver(a2), qpid::messaging::InvalidAddress); - std::string a3 = "q {assert:sender, node-properties:{x-amqp0-10-arguments:{qpid.max-count:99}}}"; + std::string a3 = "q; {assert:sender, node-properties:{x-amqp0-10-arguments:{qpid.max-count:99}}}"; BOOST_CHECK_THROW(fix.session.createSender(a3), qpid::messaging::InvalidAddress); Receiver r3 = fix.session.createReceiver(a3); r3.cancel(); |