[rhmessaging-commits] rhmessaging commits: r1720 - in store/trunk/cpp: tests and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: gordonsim
Date: 2008-02-21 16:23:31 -0500 (Thu, 21 Feb 2008)
New Revision: 1720

Modified:
   store/trunk/cpp/lib/BdbMessageStore.cpp
   store/trunk/cpp/tests/SimpleTest.cpp
Log:
Fix test for changes to PersistableMessage
Turn async back on by default



Modified: store/trunk/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/trunk/cpp/lib/BdbMessageStore.cpp	2008-02-21 18:53:14 UTC (rev 1719)
+++ store/trunk/cpp/lib/BdbMessageStore.cpp	2008-02-21 21:23:31 UTC (rev 1720)
@@ -1363,7 +1363,7 @@
 
 BdbMessageStore::Options::Options(const std::string& name) :
     qpid::Options(name),
-    storeAsync(false),
+    storeAsync(true),
     storeForce(false),
     numJrnlFiles(8),
     jrnlFsizePgs(24)

Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp	2008-02-21 18:53:14 UTC (rev 1719)
+++ store/trunk/cpp/tests/SimpleTest.cpp	2008-02-21 21:23:31 UTC (rev 1720)
@@ -244,9 +244,9 @@
             BdbMessageStore store;
             store.init(TESTDIR, async, false, 4, 1);
             store.truncate();//make sure it is empty to begin with
-            Queue queue(name, 0, &store, 0);
+            Queue::shared_ptr queue(new Queue(name, 0, &store, 0));
             FieldTable settings;
-            queue.create(settings);
+            queue->create(settings);
 
             Message::shared_ptr msg = MessageUtils::createMessage(exchange, routingKey, messageId, 14);
             MessageUtils::addContent(msg, data1);
@@ -257,7 +257,7 @@
             table.setString("abc", "xyz");
             msg->getProperties<MessageProperties>()->setApplicationHeaders(table);
 
-            queue.enqueue(0, msg);
+            queue->enqueue(0, msg);
         }//db will be closed
         {
             BdbMessageStore store;
@@ -302,16 +302,16 @@
             BdbMessageStore store;
             store.init(TESTDIR, async, false, 4, 1);
             store.truncate();//make sure it is empty to begin with
-            Queue queue(name, 0, &store, 0);
+            Queue::shared_ptr queue(new Queue(name, 0, &store, 0));
             FieldTable settings;
-            queue.create(settings);
+            queue->create(settings);
 
             Message::shared_ptr msg = MessageUtils::createMessage(exchange, routingKey, messageId, 7);
             MessageUtils::addContent(msg, data);
             msg->getProperties<DeliveryProperties>()->setDeliveryMode(PERSISTENT);
             
-            queue.enqueue(0, msg);
-            queue.dequeue(0, msg);
+            queue->enqueue(0, msg);
+            queue->dequeue(0, msg);
         }//db will be closed
         {
             BdbMessageStore store;
@@ -355,20 +355,15 @@
             store.appendContent(cpmsg, data1);
             store.appendContent(cpmsg, data2);
 
-            //AMQContentBody part1(data1);
-            //msg->addContent(&part1);FIXME
-            //AMQContentBody part2(data2);        
-            //msg->addContent(&part2);FIXME
-            
             //enqueue it
-            Queue queue(name, 0, &store, 0);
+            Queue::shared_ptr queue(new Queue(name, 0, &store, 0));
             FieldTable settings;
-            queue.create(settings);
-            queue.enqueue(0, msg);
+            queue->create(settings);
+            queue->enqueue(0, msg);
 
             //load it (without recovery)
             DummyHandler handler;
-			QueuedMessage qm(&queue, msg, 0);
+            QueuedMessage qm(queue.get(), msg, 0);
             MessageDelivery::deliver(qm, handler, 0, 
                                      MessageDelivery::getBasicConsumeToken("ignore"), 20);//52 chars of data, i.e. 2 chunks of 20 and one of 12 
             CPPUNIT_ASSERT(handler.frames.size() > 2);