[rhmessaging-commits] rhmessaging commits: r2217 - store/trunk/cpp/tests.

[rhmessaging-commits at lists.jboss.org]

Author: gordonsim
Date: 2008-07-25 11:52:21 -0400 (Fri, 25 Jul 2008)
New Revision: 2217

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:
Change dequeue() to get() inline with changes to qpid trunk.



Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp	2008-07-24 20:32:10 UTC (rev 2216)
+++ store/trunk/cpp/tests/OrderingTest.cpp	2008-07-25 15:52:21 UTC (rev 2217)
@@ -77,7 +77,7 @@
 
 bool pop()
 {
-    boost::intrusive_ptr<Message> msg = queue->dequeue().payload;
+    boost::intrusive_ptr<Message> msg = queue->get().payload;
     if (msg) {
         queue->dequeue(0, msg);
         BOOST_CHECK_EQUAL(ids.front(), msg->getProperties<MessageProperties>()->getMessageId());

Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp	2008-07-24 20:32:10 UTC (rev 2216)
+++ store/trunk/cpp/tests/SimpleTest.cpp	2008-07-25 15:52:21 UTC (rev 2217)
@@ -291,7 +291,7 @@
         Queue::shared_ptr queue = registry.find(name);
         BOOST_REQUIRE(queue);
         BOOST_CHECK_EQUAL((u_int32_t) 1, queue->getMessageCount());
-        boost::intrusive_ptr<Message> msg = queue->dequeue().payload;
+        boost::intrusive_ptr<Message> msg = queue->get().payload;
 
         BOOST_CHECK_EQUAL(exchange, msg->getExchangeName());
         BOOST_CHECK_EQUAL(routingKey, msg->getRoutingKey());
@@ -420,7 +420,7 @@
         Queue::shared_ptr queue = registry.find(name);
         BOOST_REQUIRE(queue);
         BOOST_CHECK_EQUAL((u_int32_t) 1, queue->getMessageCount());
-        boost::intrusive_ptr<Message> msg = queue->dequeue().payload;
+        boost::intrusive_ptr<Message> msg = queue->get().payload;
 
         //check headers
         BOOST_CHECK_EQUAL(exchange, msg->getExchangeName());

Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp	2008-07-24 20:32:10 UTC (rev 2216)
+++ store/trunk/cpp/tests/TransactionalTest.cpp	2008-07-25 15:52:21 UTC (rev 2217)
@@ -151,7 +151,7 @@
     BOOST_REQUIRE(queue);
     BOOST_CHECK_EQUAL(size, queue->getMessageCount());
     if (size > 0) {
-        boost::intrusive_ptr<Message> msg = queue->dequeue().payload;
+        boost::intrusive_ptr<Message> msg = queue->get().payload;
         BOOST_REQUIRE(msg);
         BOOST_CHECK_EQUAL(msgid, msg->getProperties<MessageProperties>()->getCorrelationId());
     }
@@ -165,7 +165,7 @@
     boost::intrusive_ptr<Message> msgA = createMessage("Message", "exchange", "routing_key");
     queueA->deliver(msgA);
 
-    boost::intrusive_ptr<Message> msgB = queueA->dequeue().payload;
+    boost::intrusive_ptr<Message> msgB = queueA->get().payload;
     BOOST_REQUIRE(msgB);
     //move the message from one queue to the other as a transaction
     std::auto_ptr<TransactionContext> txn = store->begin();

Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2008-07-24 20:32:10 UTC (rev 2216)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2008-07-25 15:52:21 UTC (rev 2217)
@@ -282,7 +282,7 @@
 
     void swap(TPCTransactionContext* txn, Queue::shared_ptr& from, Queue::shared_ptr& to)
     {
-        msg1 = from->dequeue().payload;//just dequeues in memory
+        msg1 = from->get().payload;//just dequeues in memory
         //move the message from one queue to the other as part of a
         //distributed transaction
         to->enqueue(txn, msg1);//note: need to enqueue it first to avoid message being deleted
@@ -291,7 +291,7 @@
 
     void dequeue(TPCTransactionContext* txn, Queue::shared_ptr& queue)
     {
-        msg2 = queue->dequeue().payload;//just dequeues in memory
+        msg2 = queue->get().payload;//just dequeues in memory
         queue->dequeue(txn, msg2);
     }
 
@@ -369,7 +369,7 @@
         BOOST_REQUIRE(queue);
         BOOST_CHECK_EQUAL(size, queue->getMessageCount());
         if (size > 0) {
-            boost::intrusive_ptr<Message> msg = queue->dequeue().payload;
+            boost::intrusive_ptr<Message> msg = queue->get().payload;
             BOOST_REQUIRE(msg);
             BOOST_CHECK_EQUAL(msgid, msg->getProperties<MessageProperties>()->getCorrelationId());
         }