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/OrderingTest.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'qpid/cpp/src/tests/legacystore/OrderingTest.cpp') diff --git a/qpid/cpp/src/tests/legacystore/OrderingTest.cpp b/qpid/cpp/src/tests/legacystore/OrderingTest.cpp index 92a09f0c60..74a9db1c73 100644 --- a/qpid/cpp/src/tests/legacystore/OrderingTest.cpp +++ b/qpid/cpp/src/tests/legacystore/OrderingTest.cpp @@ -20,16 +20,18 @@ */ #include "unit_test.h" +#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/legacystore/MessageStoreImpl.h" -#include -#include "MessageUtils.h" -#include -#include -#include #include "qpid/log/Logger.h" #include "qpid/sys/Timer.h" +#include + using namespace qpid; using namespace qpid::broker; using namespace qpid::framing; @@ -48,7 +50,7 @@ QPID_AUTO_TEST_SUITE(OrderingTest) const std::string test_filename("OrderingTest"); const char* tdp = getenv("TMP_DATA_DIR"); -const std::string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/tmp/OrderingTest"); +const std::string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/var/tmp/OrderingTest"); // === Helper fns === @@ -118,7 +120,8 @@ void restart() sys::Timer t; DtxManager mgr(t); mgr.setStore (store.get()); - RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, br.getProtocolRegistry()); + RecoveredObjects ro; + RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, br.getProtocolRegistry(), ro); store->recover(recoveryMgr); queue = queues.find(name); -- cgit v1.2.1