diff options
| author | Alan Conway <aconway@apache.org> | 2011-09-06 21:47:43 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2011-09-06 21:47:43 +0000 |
| commit | 0151921a7a9339742c95910b2b37a5183fda9f27 (patch) | |
| tree | 51da8e3577c94873ebf19d94c0cc95f447569e94 /qpid/cpp/src/tests/BrokerClusterCalls.cpp | |
| parent | 5deaca879f13eeb55fbdf0ca39e232e41294d38e (diff) | |
| download | qpid-python-qpid-2920-1.tar.gz | |
QPID-2920: Rebased on trunk, fix up minor conflicts.qpid-2920-1
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920-1@1165889 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/BrokerClusterCalls.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/BrokerClusterCalls.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/BrokerClusterCalls.cpp b/qpid/cpp/src/tests/BrokerClusterCalls.cpp index b2c07f7469..01c0639bf0 100644 --- a/qpid/cpp/src/tests/BrokerClusterCalls.cpp +++ b/qpid/cpp/src/tests/BrokerClusterCalls.cpp @@ -229,7 +229,7 @@ QPID_AUTO_TEST_CASE(testReleaseReject) { i = 0; f.s.reject(m); BOOST_CHECK_EQUAL(h.at(i++), "routing(a)"); // Routing to alt exchange - BOOST_CHECK_EQUAL(h.at(i++), "enqueue(amq.fanout_altq, a)"); + BOOST_CHECK_EQUAL(h.at(i++), "enqueue(altq, a)"); BOOST_CHECK_EQUAL(h.at(i++), "routed(a)"); BOOST_CHECK_EQUAL(h.at(i++), "dequeue(q, 1, a)"); BOOST_CHECK_EQUAL(h.size(), i); @@ -300,8 +300,8 @@ QPID_AUTO_TEST_CASE(testFanout) { sender.send(Message("a")); f.s.sync(); BOOST_CHECK_EQUAL(h.at(i++), "routing(a)"); - BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r")); - BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r")); + BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(r")); + BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(r")); BOOST_CHECK(h.at(i-1) != h.at(i-2)); BOOST_CHECK_EQUAL(h.at(i++), "routed(a)"); BOOST_CHECK_EQUAL(h.size(), i); @@ -312,10 +312,10 @@ QPID_AUTO_TEST_CASE(testFanout) { Message m2 = r2.fetch(Duration::SECOND); f.s.acknowledge(m2, true); - BOOST_CHECK_EQUAL(h.at(i++), "acquire(amq.fanout_r1, 1, a)"); - BOOST_CHECK_EQUAL(h.at(i++), "dequeue(amq.fanout_r1, 1, a)"); - BOOST_CHECK_EQUAL(h.at(i++), "acquire(amq.fanout_r2, 1, a)"); - BOOST_CHECK_EQUAL(h.at(i++), "dequeue(amq.fanout_r2, 1, a)"); + BOOST_CHECK_EQUAL(h.at(i++), "acquire(r1, 1, a)"); + BOOST_CHECK_EQUAL(h.at(i++), "dequeue(r1, 1, a)"); + BOOST_CHECK_EQUAL(h.at(i++), "acquire(r2, 1, a)"); + BOOST_CHECK_EQUAL(h.at(i++), "dequeue(r2, 1, a)"); BOOST_CHECK_EQUAL(h.size(), i); } |