From 057a0635e081848ba59964c4a8e0923e521b7fe6 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 13 Feb 2012 23:50:18 +0000 Subject: Merge branch 'qpid-3603-4-rebase' into qpid-3603-5 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-5@1243748 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/QueueTest.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src/tests/QueueTest.cpp') diff --git a/qpid/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp index 0b1b4cc59e..bb4f7b9f4b 100644 --- a/qpid/cpp/src/tests/QueueTest.cpp +++ b/qpid/cpp/src/tests/QueueTest.cpp @@ -67,6 +67,7 @@ public: }; void notify() {} void cancel() {} + void acknowledged(const QueuedMessage&) {} OwnershipToken* getSession() { return 0; } }; @@ -711,7 +712,7 @@ namespace { const std::string& expectedGroup, const int expectedId ) { - queue->dispatch(c); + BOOST_CHECK(queue->dispatch(c)); results.push_back(c->last); std::string group = c->last.payload->getProperties()->getApplicationHeaders().getAsString("GROUP-ID"); int id = c->last.payload->getProperties()->getApplicationHeaders().getAsInt("MY-ID"); @@ -1026,6 +1027,11 @@ QPID_AUTO_TEST_CASE(testMultiQueueLastNode){ queue2->setLastNodeFailure(); BOOST_CHECK_EQUAL(testStore.enqCnt, 6u); + /** + * TODO: Fix or replace the following test which incorrectly requeues a + * message that was never on the queue in the first place. This relied on + * internal details not part of the queue abstraction. + // check requeue 1 intrusive_ptr msg4 = create_message("e", "C"); intrusive_ptr msg5 = create_message("e", "D"); @@ -1047,6 +1053,7 @@ QPID_AUTO_TEST_CASE(testMultiQueueLastNode){ queue2->clearLastNodeFailure(); queue2->setLastNodeFailure(); BOOST_CHECK_EQUAL(testStore.enqCnt, 8u); + */ } QPID_AUTO_TEST_CASE(testLastNodeRecoverAndFail){ -- cgit v1.2.1