From 58ca342017a5f413587edbfe1e809e9ee708ad27 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 8 Oct 2013 15:08:44 +0000 Subject: QPID-4582: Get legacystore unit tests working git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1530300 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp') diff --git a/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp b/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp index 92e49df9e3..25bb9dc607 100644 --- a/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp +++ b/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp @@ -20,18 +20,20 @@ */ #include "unit_test.h" - -#include "qpid/legacystore/MessageStoreImpl.h" -#include #include "MessageUtils.h" + #include "qpid/broker/Queue.h" #include "qpid/broker/RecoveryManagerImpl.h" +#include "qpid/broker/PersistableObject.h" #include "qpid/framing/AMQHeaderBody.h" -#include "qpid/log/Statement.h" +#include "qpid/legacystore/MessageStoreImpl.h" #include "qpid/legacystore/TxnCtxt.h" #include "qpid/log/Logger.h" +#include "qpid/log/Statement.h" #include "qpid/sys/Timer.h" +#include + using namespace mrg::msgstore; using namespace qpid; using namespace qpid::broker; @@ -54,7 +56,7 @@ QPID_AUTO_TEST_SUITE(TwoPhaseCommitTest) const string test_filename("TwoPhaseCommitTest"); const char* tdp = getenv("TMP_DATA_DIR"); -string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/tmp/TwoPhaseCommitTest"); +string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/var/tmp/TwoPhaseCommitTest"); // === Helper fns === @@ -386,7 +388,8 @@ class TwoPhaseCommitTest links = std::auto_ptr(new LinkRegistry); dtxmgr = std::auto_ptr(new DtxManager(t)); dtxmgr->setStore (store.get()); - RecoveryManagerImpl recovery(*queues, exchanges, *links, *dtxmgr, br.getProtocolRegistry()); + RecoveredObjects ro; + RecoveryManagerImpl recovery(*queues, exchanges, *links, *dtxmgr, br.getProtocolRegistry(), ro); store->recover(recovery); queueA = queues->find(nameA); -- cgit v1.2.1