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

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-10-10 14:20:05 -0400 (Fri, 10 Oct 2008)
New Revision: 2620

Modified:
   store/trunk/cpp/tests/Makefile.am
   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:
Fix for recent changes made to qpid DtxManager class constructor.

Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am	2008-10-10 15:39:52 UTC (rev 2619)
+++ store/trunk/cpp/tests/Makefile.am	2008-10-10 18:20:05 UTC (rev 2620)
@@ -7,7 +7,7 @@
 
 TMPDIR=$(abs_srcdir)/test_tmp
 
-SUBDIRS = jrnl .
+#SUBDIRS = jrnl .
 
 TESTS =						    \
   SimpleTest                    \

Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp	2008-10-10 15:39:52 UTC (rev 2619)
+++ store/trunk/cpp/tests/OrderingTest.cpp	2008-10-10 18:20:05 UTC (rev 2620)
@@ -99,7 +99,8 @@
     store->init(test_dir, 4, 1, 8);
     ExchangeRegistry exchanges;
     LinkRegistry links(0);
-    DtxManager mgr;
+    Timer t;
+    DtxManager mgr(t);
     mgr.setStore (store.get());
     RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, 0);
     store->recover(recoveryMgr);

Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp	2008-10-10 15:39:52 UTC (rev 2619)
+++ store/trunk/cpp/tests/SimpleTest.cpp	2008-10-10 18:20:05 UTC (rev 2620)
@@ -62,7 +62,8 @@
 
 void recover(MessageStoreImpl& store, QueueRegistry& queues, ExchangeRegistry& exchanges, LinkRegistry& links)
 {
-    DtxManager mgr;
+    Timer t;
+    DtxManager mgr(t);
     mgr.setStore (&store);
     RecoveryManagerImpl recovery(queues, exchanges, links, mgr, 0);
     store.recover(recovery);
@@ -151,7 +152,6 @@
 QPID_AUTO_TEST_CASE(EmptyRecover)
 {
     cout << test_filename << ".EmptyRecover: " << flush;
-
     MessageStoreImpl store;
     store.init(test_dir, 4, 1, 8);
     store.truncate();//make sure it is empty to begin with
@@ -413,7 +413,8 @@
         registry.setStore (&store);
         ExchangeRegistry exchanges;
         LinkRegistry links(0);
-        DtxManager dtx;
+        Timer t;
+        DtxManager dtx(t);
         dtx.setStore (&store);
         RecoveryManagerImpl recovery(registry, exchanges, links, dtx, 10);
         store.recover(recovery);

Modified: store/trunk/cpp/tests/TransactionalTest.cpp
===================================================================
--- store/trunk/cpp/tests/TransactionalTest.cpp	2008-10-10 15:39:52 UTC (rev 2619)
+++ store/trunk/cpp/tests/TransactionalTest.cpp	2008-10-10 18:20:05 UTC (rev 2620)
@@ -129,7 +129,8 @@
     queues = std::auto_ptr<QueueRegistry>(new QueueRegistry);
     ExchangeRegistry exchanges;
     LinkRegistry links(0);
-    DtxManager mgr;
+    Timer t;
+    DtxManager mgr(t);
     mgr.setStore (store.get());
     RecoveryManagerImpl recovery(*queues, exchanges, links, mgr, 0);
     store->recover(recovery);

Modified: store/trunk/cpp/tests/TwoPhaseCommitTest.cpp
===================================================================
--- store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2008-10-10 15:39:52 UTC (rev 2619)
+++ store/trunk/cpp/tests/TwoPhaseCommitTest.cpp	2008-10-10 18:20:05 UTC (rev 2620)
@@ -352,10 +352,11 @@
 
         store = std::auto_ptr<T>(new T());
         store->init(test_dir, 4, 1, 8);
+        Timer t;
         ExchangeRegistry exchanges;
         queues = std::auto_ptr<QueueRegistry>(new QueueRegistry);
         links = std::auto_ptr<LinkRegistry>(new LinkRegistry(0));
-        dtxmgr = std::auto_ptr<DtxManager>(new DtxManager);
+        dtxmgr = std::auto_ptr<DtxManager>(new DtxManager(t));
         dtxmgr->setStore (store.get());
         RecoveryManagerImpl recovery(*queues, exchanges, *links, *dtxmgr, 0);
         store->recover(recovery);