Author: gordonsim
Date: 2007-08-31 13:03:31 -0400 (Fri, 31 Aug 2007)
New Revision: 903
Modified:
store/trunk/cpp/tests/OrderingTest.cpp
store/trunk/cpp/tests/SimpleTest.cpp
store/trunk/cpp/tests/TransactionalTest.cpp
store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
Log:
Changed to reflect new signature for Queue::dequeue in qpid trunk.
Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp 2007-08-30 21:42:58 UTC (rev 902)
+++ store/trunk/cpp/tests/OrderingTest.cpp 2007-08-31 17:03:31 UTC (rev 903)
@@ -106,7 +106,7 @@
bool pop()
{
- Message::shared_ptr msg = queue->dequeue();
+ Message::shared_ptr msg = queue->dequeue().payload;
if (msg) {
queue->dequeue(0, msg);
string expected = ids.front();
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2007-08-30 21:42:58 UTC (rev 902)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2007-08-31 17:03:31 UTC (rev 903)
@@ -216,7 +216,7 @@
Queue::shared_ptr queue = registry.find(name);
CPPUNIT_ASSERT(queue);
CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, queue->getMessageCount());
- Message::shared_ptr msg = queue->dequeue();
+ Message::shared_ptr msg = queue->dequeue().payload;
CPPUNIT_ASSERT_EQUAL(exchange, msg->getExchangeName());
CPPUNIT_ASSERT_EQUAL(routingKey, msg->getRoutingKey());
@@ -332,7 +332,7 @@
Queue::shared_ptr queue = registry.find(name);
CPPUNIT_ASSERT(queue);
CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, queue->getMessageCount());
- Message::shared_ptr msg = queue->dequeue();
+ Message::shared_ptr msg = queue->dequeue().payload;
//check headers
CPPUNIT_ASSERT_EQUAL(exchange, msg->getExchangeName());
Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp 2007-08-30 21:42:58 UTC (rev 902)
+++ store/trunk/cpp/tests/TransactionalTest.cpp 2007-08-31 17:03:31 UTC (rev 903)
@@ -71,7 +71,7 @@
{
setup();
- Message::shared_ptr msg = queueA->dequeue();
+ Message::shared_ptr msg = queueA->dequeue().payload;
CPPUNIT_ASSERT(msg);
//move the message from one queue to the other as a transaction
@@ -141,7 +141,7 @@
CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, x->getMessageCount());
CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, y->getMessageCount());
- Message::shared_ptr msg = y->dequeue();
+ Message::shared_ptr msg = y->dequeue().payload;
CPPUNIT_ASSERT(msg);
CPPUNIT_ASSERT_EQUAL(messageId,
msg->getProperties<MessageProperties>()->getMessageId());
}
Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2007-08-30 21:42:58 UTC (rev 902)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp 2007-08-31 17:03:31 UTC (rev 903)
@@ -261,7 +261,7 @@
void swap(TPCTransactionContext* txn)
{
- Message::shared_ptr msg = queueA->dequeue();//just dequeues in memory
+ Message::shared_ptr msg = queueA->dequeue().payload;//just dequeues in memory
//move the message from one queue to the other as part of a
//distributed transaction
queueB->enqueue(txn, msg);//note: need to enqueue it first to avoid message
being deleted
@@ -270,7 +270,7 @@
void dequeue(TPCTransactionContext* txn)
{
- Message::shared_ptr msg = queueA->dequeue();//just dequeues in memory
+ Message::shared_ptr msg = queueA->dequeue().payload;//just dequeues in memory
queueA->dequeue(txn, msg);
}
@@ -340,7 +340,7 @@
CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, x->getMessageCount());
CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, y->getMessageCount());
- Message::shared_ptr msg = y->dequeue();
+ Message::shared_ptr msg = y->dequeue().payload;
CPPUNIT_ASSERT(msg);
CPPUNIT_ASSERT_EQUAL(msgid,
msg->getProperties<MessageProperties>()->getMessageId());
}
@@ -350,7 +350,7 @@
CPPUNIT_ASSERT(queueA);
CPPUNIT_ASSERT_EQUAL(size, queueA->getMessageCount());
if (size > 0) {
- Message::shared_ptr msg = queueA->dequeue();
+ Message::shared_ptr msg = queueA->dequeue().payload;
CPPUNIT_ASSERT(msg);
CPPUNIT_ASSERT_EQUAL(msgid,
msg->getProperties<MessageProperties>()->getMessageId());
}