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

[rhmessaging-commits at lists.jboss.org]

Author: gordonsim
Date: 2008-04-21 04:52:19 -0400 (Mon, 21 Apr 2008)
New Revision: 1947

Modified:
   store/trunk/cpp/tests/MessageUtils.h
   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:
Fixes to compilation errors caused by move to final 0-10 method defs in qpid project. 



Modified: store/trunk/cpp/tests/MessageUtils.h
===================================================================
--- store/trunk/cpp/tests/MessageUtils.h	2008-04-19 16:13:50 UTC (rev 1946)
+++ store/trunk/cpp/tests/MessageUtils.h	2008-04-21 08:52:19 UTC (rev 1947)
@@ -25,6 +25,8 @@
 #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>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
@@ -32,11 +34,11 @@
 struct MessageUtils
 {
     static Message::shared_ptr createMessage(const string& exchange, const string& routingKey, 
-                                             const string& messageId="", uint64_t contentSize = 0)
+                                             const Uuid& messageId=Uuid(), uint64_t contentSize = 0)
     {
         Message::shared_ptr msg(new Message());
 
-        AMQFrame method(in_place<MessageTransferBody>(ProtocolVersion(), 0, exchange, 0, 0));
+        AMQFrame method(in_place<MessageTransferBody>(ProtocolVersion(), exchange, 0, 0));
         AMQFrame header(in_place<AMQHeaderBody>());
 
         msg->getFrames().append(method);

Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp	2008-04-19 16:13:50 UTC (rev 1946)
+++ store/trunk/cpp/tests/OrderingTest.cpp	2008-04-21 08:52:19 UTC (rev 1947)
@@ -50,7 +50,7 @@
 std::auto_ptr<BdbMessageStore> store;
 QueueRegistry queues;
 Queue::shared_ptr queue;
-std::queue<std::string> ids;
+std::queue<Uuid> ids;
 int counter = 1;
 
 void setup(bool async)
@@ -66,10 +66,7 @@
 
 void push()
 {
-    string base("Message");
-    std::stringstream id;
-    id << base << counter++;
-    string messageId(id.str());
+    Uuid messageId(true);
     ids.push(messageId);
 
     Message::shared_ptr msg = MessageUtils::createMessage("exchange", "routing_key", messageId, 0);
@@ -83,9 +80,8 @@
     Message::shared_ptr msg = queue->dequeue().payload;
     if (msg) {
         queue->dequeue(0, msg);
-        string expected = ids.front();
+        BOOST_REQUIRE_EQUAL(ids.front(), msg->getProperties<MessageProperties>()->getMessageId());
         ids.pop();
-        BOOST_REQUIRE_EQUAL(expected, msg->getProperties<MessageProperties>()->getMessageId());
         return true;
     } else {
         return false;

Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp	2008-04-19 16:13:50 UTC (rev 1946)
+++ store/trunk/cpp/tests/SimpleTest.cpp	2008-04-21 08:52:19 UTC (rev 1947)
@@ -189,7 +189,7 @@
     string name("MyDurableQueue");
     string exchange("MyExchange");
     string routingKey("MyRoutingKey");
-    string messageId = "MyMessage";
+    Uuid messageId(true);
     string data1("abcdefg");
     string data2("hijklmn");
     {
@@ -247,7 +247,7 @@
     {
         string exchange("MyExchange");
         string routingKey("MyRoutingKey");
-        string messageId = "MyMessage";
+        Uuid messageId(true);
         string data("abcdefg");
         BdbMessageStore store;
         store.init(TESTDIR, async, true, 4, 1);
@@ -280,7 +280,7 @@
     const string name("MyDurableQueue");
     const string exchange("MyExchange");
     const string routingKey("MyRoutingKey");
-    const string messageId = "MyStagedMessage";
+    const Uuid messageId(true);
     const string data1("abcdefghijklmnopqrstuvwxyz");
     const string data2("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
     {

Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp	2008-04-19 16:13:50 UTC (rev 1946)
+++ store/trunk/cpp/tests/TransactionalTest.cpp	2008-04-21 08:52:19 UTC (rev 1947)
@@ -49,7 +49,7 @@
 
 const string nameA("queueA");
 const string nameB("queueB");
-const string messageId("TxnMessage");
+const Uuid messageId(true);
 std::auto_ptr<BdbMessageStore> store;
 QueueRegistry queues;
 Queue::shared_ptr queueA;

Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2008-04-19 16:13:50 UTC (rev 1946)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2008-04-21 08:52:19 UTC (rev 1947)
@@ -233,7 +233,8 @@
 
     Message::shared_ptr createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key")
     {
-        Message::shared_ptr msg = MessageUtils::createMessage(exchange, key, id, 0);
+        Message::shared_ptr msg = MessageUtils::createMessage(exchange, key);
+        msg->getProperties<MessageProperties>()->setCorrelationId(id);        
         msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT);
         return msg;
     }
@@ -276,7 +277,7 @@
         BOOST_REQUIRE_EQUAL((u_int32_t) 1, y->getMessageCount());
         Message::shared_ptr msg = y->dequeue().payload;
         BOOST_REQUIRE(msg);
-        BOOST_REQUIRE_EQUAL(msgid, msg->getProperties<MessageProperties>()->getMessageId());        
+        BOOST_REQUIRE_EQUAL(msgid, msg->getProperties<MessageProperties>()->getCorrelationId());        
     }
 
     void checkA(u_int32_t size, const string& msgid = "<none>")
@@ -286,7 +287,7 @@
         if (size > 0) {
             Message::shared_ptr msg = queueA->dequeue().payload;
             BOOST_REQUIRE(msg);
-            BOOST_REQUIRE_EQUAL(msgid, msg->getProperties<MessageProperties>()->getMessageId());
+            BOOST_REQUIRE_EQUAL(msgid, msg->getProperties<MessageProperties>()->getCorrelationId());
         }
     }