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

[rhmessaging-commits at lists.jboss.org]

Author: gordonsim
Date: 2008-10-21 19:28:26 -0400 (Tue, 21 Oct 2008)
New Revision: 2673

Modified:
   store/trunk/cpp/tests/MessageUtils.h
   store/trunk/cpp/tests/SimpleTest.cpp
Log:
Remove dependency on MessageDelivery from qpid tree.



Modified: store/trunk/cpp/tests/MessageUtils.h
===================================================================
--- store/trunk/cpp/tests/MessageUtils.h	2008-10-21 20:32:06 UTC (rev 2672)
+++ store/trunk/cpp/tests/MessageUtils.h	2008-10-21 23:28:26 UTC (rev 2673)
@@ -23,7 +23,6 @@
 
 
 #include <qpid/broker/Message.h>
-#include <qpid/broker/MessageDelivery.h>
 #include <qpid/framing/AMQFrame.h>
 #include <qpid/framing/all_method_bodies.h>
 #include <qpid/framing/Uuid.h>
@@ -55,4 +54,11 @@
         AMQFrame content(in_place<AMQContentBody>(data));
         msg->getFrames().append(content);
     }
+
+    static void deliver(QueuedMessage& msg, FrameHandler& h, uint16_t framesize)
+    {
+        msg.payload->sendHeader(h, framesize);
+        msg.payload->sendContent(*(msg.queue), h, framesize);
+    }
+
 };

Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp	2008-10-21 20:32:06 UTC (rev 2672)
+++ store/trunk/cpp/tests/SimpleTest.cpp	2008-10-21 23:28:26 UTC (rev 2673)
@@ -302,9 +302,9 @@
     
         DummyHandler handler;
         QueuedMessage qm(queue.get(),msg,0);
-        MessageDelivery::deliver(qm, handler, 0, MessageDelivery::getMessageDeliveryToken("ignore", 0, 0), 100); 
-        BOOST_CHECK_EQUAL((size_t) 3, handler.frames.size());
-        AMQContentBody* contentBody(dynamic_cast<AMQContentBody*>(handler.frames[2].getBody()));
+        MessageUtils::deliver(qm, handler, 100);
+        BOOST_CHECK_EQUAL((size_t) 2, handler.frames.size());
+        AMQContentBody* contentBody(dynamic_cast<AMQContentBody*>(handler.frames[1].getBody()));
         BOOST_REQUIRE(contentBody);
         BOOST_CHECK_EQUAL(data1.size() + data2.size(), contentBody->getData().size());
         BOOST_CHECK_EQUAL(data1 + data2, contentBody->getData());
@@ -394,10 +394,10 @@
         DummyHandler handler;
         QueuedMessage qm(queue.get(), msg, 0);
         //52 chars of data, i.e. 2 chunks of 20 and one of 12 
-        MessageDelivery::deliver(qm, handler, 0, MessageDelivery::getMessageDeliveryToken("ignore", 0, 0), 20);
-        BOOST_REQUIRE(handler.frames.size() > 2);
+        MessageUtils::deliver(qm, handler, 20);
+        BOOST_REQUIRE(handler.frames.size() > 1);
         string loaded;
-        for (uint i = 2; i < handler.frames.size(); i++) {
+        for (uint i = 1; i < handler.frames.size(); i++) {
             AMQContentBody* contentBody(dynamic_cast<AMQContentBody*>(handler.frames[i].getBody()));
             BOOST_REQUIRE(contentBody);
             loaded += contentBody->getData();
@@ -438,11 +438,12 @@
         //load lazily
         DummyHandler handler;
         QueuedMessage qm(queue.get(),msg,0);
-        MessageDelivery::deliver(qm, handler, 0, MessageDelivery::getMessageDeliveryToken("ignore", 0, 0), 20);//52 chars of data, i.e. 2 chunks of 20 and one of 12 
+        //52 chars of data, i.e. 2 chunks of 20 and one of 12 
+        MessageUtils::deliver(qm, handler, 20);
 
-        BOOST_REQUIRE(handler.frames.size() > 2);
+        BOOST_REQUIRE(handler.frames.size() > 1);
         string loaded;
-        for (uint i = 2; i < handler.frames.size(); i++) {
+        for (uint i = 1; i < handler.frames.size(); i++) {
             AMQContentBody* contentBody(dynamic_cast<AMQContentBody*>(handler.frames[i].getBody()));
             BOOST_REQUIRE(contentBody);
             loaded += contentBody->getData();