diff options
Diffstat (limited to 'cpp/src/tests')
79 files changed, 124 insertions, 124 deletions
diff --git a/cpp/src/tests/AccumulatedAckTest.cpp b/cpp/src/tests/AccumulatedAckTest.cpp index 028ce71907..c7470c8b97 100644 --- a/cpp/src/tests/AccumulatedAckTest.cpp +++ b/cpp/src/tests/AccumulatedAckTest.cpp @@ -20,7 +20,7 @@ * */ #include "qpid/framing/AccumulatedAck.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <list> diff --git a/cpp/src/tests/Array.cpp b/cpp/src/tests/Array.cpp index c779cbe901..13b3541089 100644 --- a/cpp/src/tests/Array.cpp +++ b/cpp/src/tests/Array.cpp @@ -23,7 +23,7 @@ #include "qpid/framing/Array.h" #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ArrayTestSuite) diff --git a/cpp/src/tests/AsyncCompletion.cpp b/cpp/src/tests/AsyncCompletion.cpp index 41423d8245..30118d8ffd 100644 --- a/cpp/src/tests/AsyncCompletion.cpp +++ b/cpp/src/tests/AsyncCompletion.cpp @@ -17,9 +17,9 @@ */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/broker/NullMessageStore.h" #include "qpid/sys/BlockingQueue.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/AtomicValue.cpp b/cpp/src/tests/AtomicValue.cpp index 05083ad177..262b3637c6 100644 --- a/cpp/src/tests/AtomicValue.cpp +++ b/cpp/src/tests/AtomicValue.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/sys/AtomicValue.h" QPID_AUTO_TEST_SUITE(AtomicValueTestSuite) diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h index 397045d00b..efd5cd5d44 100644 --- a/cpp/src/tests/BrokerFixture.h +++ b/cpp/src/tests/BrokerFixture.h @@ -22,7 +22,7 @@ * */ -#include "SocketProxy.h" +#include "tests/SocketProxy.h" #include "qpid/broker/Broker.h" #include "qpid/client/Connection.h" diff --git a/cpp/src/tests/ClientMessageTest.cpp b/cpp/src/tests/ClientMessageTest.cpp index bc0945674f..ed6fca23f5 100644 --- a/cpp/src/tests/ClientMessageTest.cpp +++ b/cpp/src/tests/ClientMessageTest.cpp @@ -19,7 +19,7 @@ /**@file Unit tests for the client::Message class. */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/client/Message.h" using namespace qpid::client; diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp index 3ed7491f7d..0adf6ccc27 100644 --- a/cpp/src/tests/ClientSessionTest.cpp +++ b/cpp/src/tests/ClientSessionTest.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/client/QueueOptions.h" #include "qpid/client/MessageListener.h" #include "qpid/client/SubscriptionManager.h" diff --git a/cpp/src/tests/ClusterFailover.cpp b/cpp/src/tests/ClusterFailover.cpp index 9ce9c4a36b..5eb7d824fd 100644 --- a/cpp/src/tests/ClusterFailover.cpp +++ b/cpp/src/tests/ClusterFailover.cpp @@ -24,9 +24,9 @@ * In this case the failed nodes must shut down. */ -#include "test_tools.h" -#include "unit_test.h" -#include "ClusterFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ClusterFixture.h" #include "qpid/client/FailoverManager.h" #include <boost/assign.hpp> #include <boost/algorithm/string.hpp> diff --git a/cpp/src/tests/ClusterFixture.cpp b/cpp/src/tests/ClusterFixture.cpp index e12106c464..d9cf909a5c 100644 --- a/cpp/src/tests/ClusterFixture.cpp +++ b/cpp/src/tests/ClusterFixture.cpp @@ -16,10 +16,10 @@ * */ -#include "test_tools.h" -#include "unit_test.h" -#include "ForkedBroker.h" -#include "BrokerFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ForkedBroker.h" +#include "tests/BrokerFixture.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionAccess.h" @@ -59,7 +59,7 @@ using qpid::cluster::Cluster; using boost::assign::list_of; -#include "ClusterFixture.h" +#include "tests/ClusterFixture.h" ClusterFixture::ClusterFixture(size_t n, const Args& args_, int localIndex_) : name(Uuid(true).str()), localIndex(localIndex_), userArgs(args_) diff --git a/cpp/src/tests/ClusterFixture.h b/cpp/src/tests/ClusterFixture.h index 08b314499e..a05a83ddd6 100644 --- a/cpp/src/tests/ClusterFixture.h +++ b/cpp/src/tests/ClusterFixture.h @@ -19,10 +19,10 @@ * */ -#include "test_tools.h" -#include "unit_test.h" -#include "ForkedBroker.h" -#include "BrokerFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ForkedBroker.h" +#include "tests/BrokerFixture.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionAccess.h" diff --git a/cpp/src/tests/ConsoleTest.cpp b/cpp/src/tests/ConsoleTest.cpp index 1d55b13f3c..30dbf4bd1d 100644 --- a/cpp/src/tests/ConsoleTest.cpp +++ b/cpp/src/tests/ConsoleTest.cpp @@ -21,7 +21,7 @@ #include "qpid/console/Package.h" #include "qpid/console/ClassKey.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ConsoleTestSuite) diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/cpp/src/tests/DeliveryRecordTest.cpp index 8ff7ad3584..f99219b9d6 100644 --- a/cpp/src/tests/DeliveryRecordTest.cpp +++ b/cpp/src/tests/DeliveryRecordTest.cpp @@ -20,7 +20,7 @@ * */ #include "qpid/broker/DeliveryRecord.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <memory> #include <boost/format.hpp> diff --git a/cpp/src/tests/DtxWorkRecordTest.cpp b/cpp/src/tests/DtxWorkRecordTest.cpp index c7c1b460ff..9095f968b1 100644 --- a/cpp/src/tests/DtxWorkRecordTest.cpp +++ b/cpp/src/tests/DtxWorkRecordTest.cpp @@ -19,10 +19,10 @@ * */ #include "qpid/broker/DtxWorkRecord.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <vector> -#include "TxMocks.h" +#include "tests/TxMocks.h" using namespace qpid::broker; using boost::static_pointer_cast; diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp index 2100fb5ed7..68d681ea3b 100644 --- a/cpp/src/tests/ExchangeTest.cpp +++ b/cpp/src/tests/ExchangeTest.cpp @@ -29,9 +29,9 @@ #include "qpid/broker/HeadersExchange.h" #include "qpid/broker/TopicExchange.h" #include "qpid/framing/reply_exceptions.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> -#include "MessageUtils.h" +#include "tests/MessageUtils.h" using boost::intrusive_ptr; using namespace qpid::broker; diff --git a/cpp/src/tests/FieldTable.cpp b/cpp/src/tests/FieldTable.cpp index a02bbd5194..4a74b4560f 100644 --- a/cpp/src/tests/FieldTable.cpp +++ b/cpp/src/tests/FieldTable.cpp @@ -24,7 +24,7 @@ #include "qpid/framing/FieldValue.h" #include "qpid/sys/alloca.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::framing; diff --git a/cpp/src/tests/FieldValue.cpp b/cpp/src/tests/FieldValue.cpp index 448f068107..235a4876b8 100644 --- a/cpp/src/tests/FieldValue.cpp +++ b/cpp/src/tests/FieldValue.cpp @@ -18,7 +18,7 @@ */ #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(FieldValueTestSuite) diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp index ee29926ff8..6f914477ff 100644 --- a/cpp/src/tests/ForkedBroker.cpp +++ b/cpp/src/tests/ForkedBroker.cpp @@ -19,7 +19,7 @@ * */ -#include "ForkedBroker.h" +#include "tests/ForkedBroker.h" #include "qpid/log/Statement.h" #include <boost/bind.hpp> #include <algorithm> diff --git a/cpp/src/tests/Frame.cpp b/cpp/src/tests/Frame.cpp index 11905911fa..15fbaf137b 100644 --- a/cpp/src/tests/Frame.cpp +++ b/cpp/src/tests/Frame.cpp @@ -21,7 +21,7 @@ #include "qpid/framing/Frame.h" #include <boost/lexical_cast.hpp> -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(FrameTestSuite) diff --git a/cpp/src/tests/FrameDecoder.cpp b/cpp/src/tests/FrameDecoder.cpp index f5db66d5fe..2d4e4c6f19 100644 --- a/cpp/src/tests/FrameDecoder.cpp +++ b/cpp/src/tests/FrameDecoder.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/FrameDecoder.h" #include "qpid/framing/AMQContentBody.h" diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp index e09ee19bc2..04c273d8a2 100644 --- a/cpp/src/tests/FramingTest.cpp +++ b/cpp/src/tests/FramingTest.cpp @@ -25,7 +25,7 @@ #include "qpid/framing/all_method_bodies.h" #include "qpid/framing/amqp_framing.h" #include "qpid/framing/reply_exceptions.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <boost/bind.hpp> #include <boost/lexical_cast.hpp> diff --git a/cpp/src/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp index 01e7c22ee6..ece842fe0e 100644 --- a/cpp/src/tests/HeaderTest.cpp +++ b/cpp/src/tests/HeaderTest.cpp @@ -21,7 +21,7 @@ #include <iostream> #include "qpid/framing/amqp_framing.h" #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::framing; using namespace std; diff --git a/cpp/src/tests/HeadersExchangeTest.cpp b/cpp/src/tests/HeadersExchangeTest.cpp index 46933f955a..030f3a2221 100644 --- a/cpp/src/tests/HeadersExchangeTest.cpp +++ b/cpp/src/tests/HeadersExchangeTest.cpp @@ -23,7 +23,7 @@ #include "qpid/broker/HeadersExchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/FieldValue.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::broker; using namespace qpid::framing; diff --git a/cpp/src/tests/IncompleteMessageList.cpp b/cpp/src/tests/IncompleteMessageList.cpp index e830df0e8b..d7134ef2db 100644 --- a/cpp/src/tests/IncompleteMessageList.cpp +++ b/cpp/src/tests/IncompleteMessageList.cpp @@ -25,7 +25,7 @@ #include "qpid/broker/Queue.h" #include "qpid/broker/IncompleteMessageList.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(IncompleteMessageListTestSuite) diff --git a/cpp/src/tests/InlineAllocator.cpp b/cpp/src/tests/InlineAllocator.cpp index fe6eaefaf4..6106c633c9 100644 --- a/cpp/src/tests/InlineAllocator.cpp +++ b/cpp/src/tests/InlineAllocator.cpp @@ -20,7 +20,7 @@ */ #include "qpid/InlineAllocator.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(InlineAllocatorTestSuite) diff --git a/cpp/src/tests/InlineVector.cpp b/cpp/src/tests/InlineVector.cpp index 009f10af9d..98a2a36236 100644 --- a/cpp/src/tests/InlineVector.cpp +++ b/cpp/src/tests/InlineVector.cpp @@ -20,7 +20,7 @@ */ #include "qpid/InlineVector.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(InlineVectorTestSuite) diff --git a/cpp/src/tests/ManagementTest.cpp b/cpp/src/tests/ManagementTest.cpp index e6f2e2e3fd..e99a799f37 100644 --- a/cpp/src/tests/ManagementTest.cpp +++ b/cpp/src/tests/ManagementTest.cpp @@ -22,7 +22,7 @@ #include "qpid/management/ManagementObject.h" #include "qpid/framing/Buffer.h" #include "qpid/console/ObjectId.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ManagementTestSuite) diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp index 1f3f830633..f04d16155d 100644 --- a/cpp/src/tests/MessageBuilderTest.cpp +++ b/cpp/src/tests/MessageBuilderTest.cpp @@ -24,7 +24,7 @@ #include "qpid/framing/frame_functors.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/TypeFilter.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <list> using namespace qpid::broker; diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/cpp/src/tests/MessageReplayTracker.cpp index a5121cdeb7..2a0e74291b 100644 --- a/cpp/src/tests/MessageReplayTracker.cpp +++ b/cpp/src/tests/MessageReplayTracker.cpp @@ -18,8 +18,8 @@ * under the License. * */ -#include "unit_test.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/BrokerFixture.h" #include "qpid/client/MessageReplayTracker.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp index cd63f64a37..066ba006e5 100644 --- a/cpp/src/tests/MessageTest.cpp +++ b/cpp/src/tests/MessageTest.cpp @@ -26,7 +26,7 @@ #include "qpid/framing/Uuid.h" #include "qpid/sys/alloca.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> diff --git a/cpp/src/tests/PartialFailure.cpp b/cpp/src/tests/PartialFailure.cpp index 7169e53a16..d6361bd215 100644 --- a/cpp/src/tests/PartialFailure.cpp +++ b/cpp/src/tests/PartialFailure.cpp @@ -24,9 +24,9 @@ * In this case the failed nodes must shut down. */ -#include "test_tools.h" -#include "unit_test.h" -#include "ClusterFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ClusterFixture.h" #include <boost/assign.hpp> #include <boost/algorithm/string.hpp> #include <boost/bind.hpp> diff --git a/cpp/src/tests/PollableCondition.cpp b/cpp/src/tests/PollableCondition.cpp index b5cf1b4cd2..acc6b6f0ec 100644 --- a/cpp/src/tests/PollableCondition.cpp +++ b/cpp/src/tests/PollableCondition.cpp @@ -19,8 +19,8 @@ * */ -#include "test_tools.h" -#include "unit_test.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" #include "qpid/sys/Poller.h" #include "qpid/sys/PollableCondition.h" #include "qpid/sys/Monitor.h" diff --git a/cpp/src/tests/ProxyTest.cpp b/cpp/src/tests/ProxyTest.cpp index 4ea10f7be9..ce5cc5abd6 100644 --- a/cpp/src/tests/ProxyTest.cpp +++ b/cpp/src/tests/ProxyTest.cpp @@ -24,7 +24,7 @@ #include "qpid/framing/ExecutionSyncBody.h" #include "qpid/framing/Proxy.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::framing; diff --git a/cpp/src/tests/QueueEvents.cpp b/cpp/src/tests/QueueEvents.cpp index cd9439355e..3f9e1239f2 100644 --- a/cpp/src/tests/QueueEvents.cpp +++ b/cpp/src/tests/QueueEvents.cpp @@ -19,9 +19,9 @@ * */ -#include "MessageUtils.h" -#include "unit_test.h" -#include "BrokerFixture.h" +#include "tests/MessageUtils.h" +#include "tests/unit_test.h" +#include "tests/BrokerFixture.h" #include "qpid/broker/Message.h" #include "qpid/broker/Queue.h" #include "qpid/broker/QueueEvents.h" diff --git a/cpp/src/tests/QueueOptionsTest.cpp b/cpp/src/tests/QueueOptionsTest.cpp index 93d1961caa..740c59b2e0 100644 --- a/cpp/src/tests/QueueOptionsTest.cpp +++ b/cpp/src/tests/QueueOptionsTest.cpp @@ -22,7 +22,7 @@ #include "qpid/framing/Array.h" #include "qpid/client/QueueOptions.h" -#include "unit_test.h" +#include "tests/unit_test.h" using namespace qpid::client; diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/cpp/src/tests/QueuePolicyTest.cpp index 7c7f8b7a10..33d9fefcfe 100644 --- a/cpp/src/tests/QueuePolicyTest.cpp +++ b/cpp/src/tests/QueuePolicyTest.cpp @@ -18,15 +18,15 @@ * under the License. * */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/broker/QueuePolicy.h" #include "qpid/client/QueueOptions.h" #include "qpid/sys/Time.h" #include "qpid/framing/reply_exceptions.h" -#include "MessageUtils.h" -#include "BrokerFixture.h" +#include "tests/MessageUtils.h" +#include "tests/BrokerFixture.h" using namespace qpid::broker; using namespace qpid::client; diff --git a/cpp/src/tests/QueueRegistryTest.cpp b/cpp/src/tests/QueueRegistryTest.cpp index 7ad4e0b89d..2194db5201 100644 --- a/cpp/src/tests/QueueRegistryTest.cpp +++ b/cpp/src/tests/QueueRegistryTest.cpp @@ -18,7 +18,7 @@ */ #include "qpid/broker/QueueRegistry.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <string> using namespace qpid::broker; diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp index be4a87d2ab..85bfcd3c06 100644 --- a/cpp/src/tests/QueueTest.cpp +++ b/cpp/src/tests/QueueTest.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/Exception.h" #include "qpid/broker/Broker.h" #include "qpid/broker/Queue.h" diff --git a/cpp/src/tests/RangeSet.cpp b/cpp/src/tests/RangeSet.cpp index 9c602de78d..4c5760f697 100644 --- a/cpp/src/tests/RangeSet.cpp +++ b/cpp/src/tests/RangeSet.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/RangeSet.h" using namespace std; diff --git a/cpp/src/tests/RateFlowcontrolTest.cpp b/cpp/src/tests/RateFlowcontrolTest.cpp index b8fda09f61..9f6aeea4c7 100644 --- a/cpp/src/tests/RateFlowcontrolTest.cpp +++ b/cpp/src/tests/RateFlowcontrolTest.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/broker/RateFlowcontrol.h" #include "qpid/sys/Time.h" diff --git a/cpp/src/tests/RefCounted.cpp b/cpp/src/tests/RefCounted.cpp index 8c679a3d2e..e9d90cb462 100644 --- a/cpp/src/tests/RefCounted.cpp +++ b/cpp/src/tests/RefCounted.cpp @@ -19,7 +19,7 @@ #include "qpid/RefCounted.h" #include <boost/intrusive_ptr.hpp> -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(RefCountedTestSuiteTestSuite) diff --git a/cpp/src/tests/ReplicationTest.cpp b/cpp/src/tests/ReplicationTest.cpp index 38dc1a9e52..38369640a9 100644 --- a/cpp/src/tests/ReplicationTest.cpp +++ b/cpp/src/tests/ReplicationTest.cpp @@ -18,9 +18,9 @@ * under the License. * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/Plugin.h" #include "qpid/broker/Broker.h" diff --git a/cpp/src/tests/RetryList.cpp b/cpp/src/tests/RetryList.cpp index 80f59bf15f..55d27c947c 100644 --- a/cpp/src/tests/RetryList.cpp +++ b/cpp/src/tests/RetryList.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/broker/RetryList.h" using namespace qpid; diff --git a/cpp/src/tests/SequenceNumberTest.cpp b/cpp/src/tests/SequenceNumberTest.cpp index e4c6d066ef..87d5d6baeb 100644 --- a/cpp/src/tests/SequenceNumberTest.cpp +++ b/cpp/src/tests/SequenceNumberTest.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include "qpid/framing/SequenceNumber.h" #include "qpid/framing/SequenceNumberSet.h" diff --git a/cpp/src/tests/SequenceSet.cpp b/cpp/src/tests/SequenceSet.cpp index ba2f1391a1..3039b126d6 100644 --- a/cpp/src/tests/SequenceSet.cpp +++ b/cpp/src/tests/SequenceSet.cpp @@ -17,7 +17,7 @@ */ #include "qpid/framing/SequenceSet.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <list> QPID_AUTO_TEST_SUITE(SequenceSetTestSuite) diff --git a/cpp/src/tests/SessionState.cpp b/cpp/src/tests/SessionState.cpp index 5e21ff2b70..41010d7ef3 100644 --- a/cpp/src/tests/SessionState.cpp +++ b/cpp/src/tests/SessionState.cpp @@ -16,7 +16,7 @@ * */ -#include "unit_test.h" +#include "tests/unit_test.h" #include "qpid/SessionState.h" #include "qpid/Exception.h" diff --git a/cpp/src/tests/Shlib.cpp b/cpp/src/tests/Shlib.cpp index 7d2f2456c7..3465b0f27e 100644 --- a/cpp/src/tests/Shlib.cpp +++ b/cpp/src/tests/Shlib.cpp @@ -18,11 +18,11 @@ * */ -#include "test_tools.h" +#include "tests/test_tools.h" #include "qpid/sys/Shlib.h" #include "qpid/Exception.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(ShlibTestSuite) diff --git a/cpp/src/tests/StringUtils.cpp b/cpp/src/tests/StringUtils.cpp index 6a19119288..6755b3d62a 100644 --- a/cpp/src/tests/StringUtils.cpp +++ b/cpp/src/tests/StringUtils.cpp @@ -21,7 +21,7 @@ #include <iostream> #include "qpid/StringUtils.h" -#include "unit_test.h" +#include "tests/unit_test.h" QPID_AUTO_TEST_SUITE(StringUtilsTestSuite) diff --git a/cpp/src/tests/TestOptions.h b/cpp/src/tests/TestOptions.h index a400fe5ecb..758eef99f1 100644 --- a/cpp/src/tests/TestOptions.h +++ b/cpp/src/tests/TestOptions.h @@ -26,7 +26,7 @@ #include "qpid/Url.h" #include "qpid/log/Logger.h" #include "qpid/client/Connection.h" -#include "ConnectionOptions.h" +#include "tests/ConnectionOptions.h" #include <iostream> #include <exception> diff --git a/cpp/src/tests/TimerTest.cpp b/cpp/src/tests/TimerTest.cpp index f8ab9fb2f3..0bf29eeac1 100644 --- a/cpp/src/tests/TimerTest.cpp +++ b/cpp/src/tests/TimerTest.cpp @@ -21,7 +21,7 @@ */ #include "qpid/broker/Timer.h" #include "qpid/sys/Monitor.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <math.h> #include <iostream> #include <memory> diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/cpp/src/tests/TopicExchangeTest.cpp index d707066534..ae22df1d44 100644 --- a/cpp/src/tests/TopicExchangeTest.cpp +++ b/cpp/src/tests/TopicExchangeTest.cpp @@ -17,8 +17,8 @@ * under the License. */ #include "qpid/broker/TopicExchange.h" -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" using namespace qpid::broker; using namespace std; diff --git a/cpp/src/tests/TxBufferTest.cpp b/cpp/src/tests/TxBufferTest.cpp index 3d6a12cacc..095827e45e 100644 --- a/cpp/src/tests/TxBufferTest.cpp +++ b/cpp/src/tests/TxBufferTest.cpp @@ -19,10 +19,10 @@ * */ #include "qpid/broker/TxBuffer.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <vector> -#include "TxMocks.h" +#include "tests/TxMocks.h" using namespace qpid::broker; using boost::static_pointer_cast; diff --git a/cpp/src/tests/TxPublishTest.cpp b/cpp/src/tests/TxPublishTest.cpp index 63dbf99266..d29c23e005 100644 --- a/cpp/src/tests/TxPublishTest.cpp +++ b/cpp/src/tests/TxPublishTest.cpp @@ -21,12 +21,12 @@ #include "qpid/broker/NullMessageStore.h" #include "qpid/broker/RecoveryManager.h" #include "qpid/broker/TxPublish.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <iostream> #include <list> #include <vector> -#include "MessageUtils.h" -#include "TestMessageStore.h" +#include "tests/MessageUtils.h" +#include "tests/TestMessageStore.h" using std::list; using std::pair; diff --git a/cpp/src/tests/Url.cpp b/cpp/src/tests/Url.cpp index f3b42a7208..f8c347cb79 100644 --- a/cpp/src/tests/Url.cpp +++ b/cpp/src/tests/Url.cpp @@ -17,8 +17,8 @@ */ -#include "unit_test.h" -#include "test_tools.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" #include "qpid/Url.h" #include <boost/assign.hpp> diff --git a/cpp/src/tests/Uuid.cpp b/cpp/src/tests/Uuid.cpp index ea2e80b63b..57946f9eb4 100644 --- a/cpp/src/tests/Uuid.cpp +++ b/cpp/src/tests/Uuid.cpp @@ -20,7 +20,7 @@ #include "qpid/framing/Buffer.h" #include "qpid/sys/alloca.h" -#include "unit_test.h" +#include "tests/unit_test.h" #include <set> diff --git a/cpp/src/tests/XmlClientSessionTest.cpp b/cpp/src/tests/XmlClientSessionTest.cpp index b6b8520bd8..368b539f23 100644 --- a/cpp/src/tests/XmlClientSessionTest.cpp +++ b/cpp/src/tests/XmlClientSessionTest.cpp @@ -19,9 +19,9 @@ * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/sys/Shlib.h" #include "qpid/sys/Monitor.h" #include "qpid/sys/Thread.h" diff --git a/cpp/src/tests/ais_test.cpp b/cpp/src/tests/ais_test.cpp index 00c61242e4..66b46a9116 100644 --- a/cpp/src/tests/ais_test.cpp +++ b/cpp/src/tests/ais_test.cpp @@ -19,5 +19,5 @@ // Defines test_main function to link with actual unit test code. #define BOOST_AUTO_TEST_MAIN // Boost 1.33 #define BOOST_TEST_MAIN -#include "unit_test.h" +#include "tests/unit_test.h" diff --git a/cpp/src/tests/amqp_0_10/Map.cpp b/cpp/src/tests/amqp_0_10/Map.cpp index efde967050..b5402bd11f 100644 --- a/cpp/src/tests/amqp_0_10/Map.cpp +++ b/cpp/src/tests/amqp_0_10/Map.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/amqp_0_10/Map.h" #include "qpid/amqp_0_10/Array.h" #include "qpid/amqp_0_10/Struct32.h" diff --git a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp b/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp index 9d4fcb8935..a6a7e4bbac 100644 --- a/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp +++ b/cpp/src/tests/amqp_0_10/ProxyTemplate.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/amqp_0_10/ProxyTemplate.h" #include <boost/any.hpp> diff --git a/cpp/src/tests/amqp_0_10/apply.cpp b/cpp/src/tests/amqp_0_10/apply.cpp index 5a67c28c79..b3ff60e7fa 100644 --- a/cpp/src/tests/amqp_0_10/apply.cpp +++ b/cpp/src/tests/amqp_0_10/apply.cpp @@ -18,7 +18,7 @@ * under the License. * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/amqp_0_10/specification.h" #include "qpid/amqp_0_10/ApplyControl.h" diff --git a/cpp/src/tests/amqp_0_10/handlers.cpp b/cpp/src/tests/amqp_0_10/handlers.cpp index 428643c802..1ca61e3331 100644 --- a/cpp/src/tests/amqp_0_10/handlers.cpp +++ b/cpp/src/tests/amqp_0_10/handlers.cpp @@ -19,7 +19,7 @@ * */ -#include "unit_test.h" +#include "tests/amqp_0_10/unit_test.h" #include "qpid/Exception.h" #include "qpid/amqp_0_10/Unit.h" #include "qpid/amqp_0_10/ControlHolder.h" diff --git a/cpp/src/tests/amqp_0_10/serialize.cpp b/cpp/src/tests/amqp_0_10/serialize.cpp index 0cfeb8d28d..2d5b9d75e4 100644 --- a/cpp/src/tests/amqp_0_10/serialize.cpp +++ b/cpp/src/tests/amqp_0_10/serialize.cpp @@ -19,8 +19,8 @@ * */ -#include "unit_test.h" -#include "allSegmentTypes.h" +#include "tests/amqp_0_10/unit_test.h" +#include "tests/amqp_0_10/allSegmentTypes.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/Buffer.h" diff --git a/cpp/src/tests/client_test.cpp b/cpp/src/tests/client_test.cpp index 05b42f620c..d78a7aa002 100644 --- a/cpp/src/tests/client_test.cpp +++ b/cpp/src/tests/client_test.cpp @@ -28,7 +28,7 @@ #include <iostream> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/cluster_test.cpp b/cpp/src/tests/cluster_test.cpp index 50ca241b5d..2375eb17eb 100644 --- a/cpp/src/tests/cluster_test.cpp +++ b/cpp/src/tests/cluster_test.cpp @@ -16,11 +16,11 @@ * */ -#include "test_tools.h" -#include "unit_test.h" -#include "ForkedBroker.h" -#include "BrokerFixture.h" -#include "ClusterFixture.h" +#include "tests/test_tools.h" +#include "tests/unit_test.h" +#include "tests/ForkedBroker.h" +#include "tests/BrokerFixture.h" +#include "tests/ClusterFixture.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionSettings.h" diff --git a/cpp/src/tests/consume.cpp b/cpp/src/tests/consume.cpp index 3aacf8b3da..be22bdccc9 100644 --- a/cpp/src/tests/consume.cpp +++ b/cpp/src/tests/consume.cpp @@ -25,7 +25,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp index 379e957ef1..faa8f416f7 100644 --- a/cpp/src/tests/exception_test.cpp +++ b/cpp/src/tests/exception_test.cpp @@ -19,9 +19,9 @@ * */ -#include "unit_test.h" -#include "test_tools.h" -#include "BrokerFixture.h" +#include "tests/unit_test.h" +#include "tests/test_tools.h" +#include "tests/BrokerFixture.h" #include "qpid/client/SubscriptionManager.h" #include "qpid/client/MessageListener.h" #include "qpid/sys/Runnable.h" diff --git a/cpp/src/tests/header_test.cpp b/cpp/src/tests/header_test.cpp index c36b4f3bc3..72da6d0073 100644 --- a/cpp/src/tests/header_test.cpp +++ b/cpp/src/tests/header_test.cpp @@ -21,7 +21,7 @@ #include <iostream> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/latencytest.cpp b/cpp/src/tests/latencytest.cpp index 6ad84e1b82..ecae673fb9 100644 --- a/cpp/src/tests/latencytest.cpp +++ b/cpp/src/tests/latencytest.cpp @@ -27,7 +27,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/sys/Thread.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" diff --git a/cpp/src/tests/logging.cpp b/cpp/src/tests/logging.cpp index 00e1d7de85..76f5a768dc 100644 --- a/cpp/src/tests/logging.cpp +++ b/cpp/src/tests/logging.cpp @@ -16,7 +16,7 @@ * */ -#include "test_tools.h" +#include "tests/test_tools.h" #include "qpid/log/Logger.h" #include "qpid/log/Options.h" #include "qpid/log/OstreamOutput.h" @@ -30,7 +30,7 @@ #include <boost/test/floating_point_comparison.hpp> #include <boost/format.hpp> -#include "unit_test.h" +#include "tests/unit_test.h" #include <exception> #include <fstream> diff --git a/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp index f55528fcd5..45f8164f5e 100644 --- a/cpp/src/tests/perftest.cpp +++ b/cpp/src/tests/perftest.cpp @@ -19,7 +19,7 @@ * */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/AsyncSession.h" #include "qpid/client/SubscriptionManager.h" diff --git a/cpp/src/tests/publish.cpp b/cpp/src/tests/publish.cpp index 34c2b8fefc..d447735aee 100644 --- a/cpp/src/tests/publish.cpp +++ b/cpp/src/tests/publish.cpp @@ -25,7 +25,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/qpid_ping.cpp b/cpp/src/tests/qpid_ping.cpp index cc07ade7bb..e55b9c5770 100644 --- a/cpp/src/tests/qpid_ping.cpp +++ b/cpp/src/tests/qpid_ping.cpp @@ -20,7 +20,7 @@ */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/SubscriptionManager.h" #include "qpid/client/Connection.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/receiver.cpp b/cpp/src/tests/receiver.cpp index 49f7ff0338..d3cc362dc4 100644 --- a/cpp/src/tests/receiver.cpp +++ b/cpp/src/tests/receiver.cpp @@ -24,7 +24,7 @@ #include <qpid/client/Message.h> #include <qpid/client/SubscriptionManager.h> #include <qpid/client/SubscriptionSettings.h> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include <iostream> #include <fstream> diff --git a/cpp/src/tests/sender.cpp b/cpp/src/tests/sender.cpp index 311de2e5f8..62f82070d8 100644 --- a/cpp/src/tests/sender.cpp +++ b/cpp/src/tests/sender.cpp @@ -26,7 +26,7 @@ #include <qpid/client/MessageReplayTracker.h> #include <qpid/client/QueueOptions.h> #include <qpid/Exception.h> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include <fstream> #include <iostream> diff --git a/cpp/src/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp index 44070cd4c9..f02690caa8 100644 --- a/cpp/src/tests/topic_listener.cpp +++ b/cpp/src/tests/topic_listener.cpp @@ -32,7 +32,7 @@ * listening). */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/MessageListener.h" #include "qpid/client/Session.h" diff --git a/cpp/src/tests/topic_publisher.cpp b/cpp/src/tests/topic_publisher.cpp index 40055bbfa0..d1cddb5afe 100644 --- a/cpp/src/tests/topic_publisher.cpp +++ b/cpp/src/tests/topic_publisher.cpp @@ -34,7 +34,7 @@ * subscriber shutdown. */ -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/MessageListener.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/txjob.cpp b/cpp/src/tests/txjob.cpp index 94db96a666..fc16ef2b16 100644 --- a/cpp/src/tests/txjob.cpp +++ b/cpp/src/tests/txjob.cpp @@ -23,7 +23,7 @@ #include <boost/bind.hpp> #include <boost/ptr_container/ptr_vector.hpp> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/AsyncSession.h" #include "qpid/client/FailoverManager.h" #include "qpid/client/Message.h" diff --git a/cpp/src/tests/txshift.cpp b/cpp/src/tests/txshift.cpp index 97135c9829..1d11e366d2 100644 --- a/cpp/src/tests/txshift.cpp +++ b/cpp/src/tests/txshift.cpp @@ -23,7 +23,7 @@ #include <boost/bind.hpp> #include <boost/ptr_container/ptr_vector.hpp> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/AsyncSession.h" #include "qpid/client/FailoverManager.h" #include "qpid/client/Message.h" diff --git a/cpp/src/tests/txtest.cpp b/cpp/src/tests/txtest.cpp index c1ee246e2c..5b9d2703fb 100644 --- a/cpp/src/tests/txtest.cpp +++ b/cpp/src/tests/txtest.cpp @@ -26,7 +26,7 @@ #include <sstream> #include <vector> -#include "TestOptions.h" +#include "tests/TestOptions.h" #include "qpid/client/Connection.h" #include "qpid/client/Message.h" #include "qpid/client/AsyncSession.h" diff --git a/cpp/src/tests/unit_test.cpp b/cpp/src/tests/unit_test.cpp index 00c61242e4..66b46a9116 100644 --- a/cpp/src/tests/unit_test.cpp +++ b/cpp/src/tests/unit_test.cpp @@ -19,5 +19,5 @@ // Defines test_main function to link with actual unit test code. #define BOOST_AUTO_TEST_MAIN // Boost 1.33 #define BOOST_TEST_MAIN -#include "unit_test.h" +#include "tests/unit_test.h" |