diff options
author | Aidan Skinner <aidan@apache.org> | 2009-09-17 16:21:13 +0000 |
---|---|---|
committer | Aidan Skinner <aidan@apache.org> | 2009-09-17 16:21:13 +0000 |
commit | 7d6a028be9f6c47418e98a6fa74a359864428150 (patch) | |
tree | 78083427e88c48edb3b23605309e57f1301cba19 /qpid/cpp/src/tests/BrokerFixture.h | |
parent | 31bbc100ac6b3a31eb25d29f407d60ff23334d1f (diff) | |
download | qpid-python-7d6a028be9f6c47418e98a6fa74a359864428150.tar.gz |
Merge from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816261 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/BrokerFixture.h')
-rw-r--r-- | qpid/cpp/src/tests/BrokerFixture.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/BrokerFixture.h b/qpid/cpp/src/tests/BrokerFixture.h index 397045d00b..bb985cf7e1 100644 --- a/qpid/cpp/src/tests/BrokerFixture.h +++ b/qpid/cpp/src/tests/BrokerFixture.h @@ -10,9 +10,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -35,6 +35,9 @@ #include "qpid/sys/Thread.h" #include <boost/noncopyable.hpp> +namespace qpid { +namespace tests { + /** * A fixture with an in-process broker. */ @@ -55,7 +58,7 @@ struct BrokerFixture : private boost::noncopyable { } opts.port=0; // Management doesn't play well with multiple in-process brokers. - opts.enableMgmt=false; + opts.enableMgmt=false; opts.workerThreads=1; opts.dataDir=""; opts.auth=false; @@ -144,5 +147,6 @@ struct SessionFixtureT : BrokerFixture, ClientT<ConnectionType,SessionType> { typedef SessionFixtureT<LocalConnection> SessionFixture; typedef SessionFixtureT<ProxyConnection> ProxySessionFixture; +}} // namespace qpid::tests #endif /*!TESTS_BROKERFIXTURE_H*/ |