diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-02 21:38:25 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-02 21:38:25 +0000 |
| commit | 3ff35b94f59f92bf33c8f4d29643c4ad899b4673 (patch) | |
| tree | f45d78a5d4a03408e813cc1fc82f7ba749053d44 /cpp/src/tests/interop_runner.cpp | |
| parent | 93aa60d35700a912d47719770f294135292359e6 (diff) | |
| download | qpid-python-3ff35b94f59f92bf33c8f4d29643c4ad899b4673.tar.gz | |
Separate option parsing from qpid::client::ClientSettings.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@662581 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/interop_runner.cpp')
| -rw-r--r-- | cpp/src/tests/interop_runner.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/tests/interop_runner.cpp b/cpp/src/tests/interop_runner.cpp index 9435b8169f..8c6e0a6991 100644 --- a/cpp/src/tests/interop_runner.cpp +++ b/cpp/src/tests/interop_runner.cpp @@ -24,7 +24,7 @@ #include "qpid/Exception.h" #include "qpid/client/Channel.h" #include "qpid/client/Connection.h" -#include "qpid/client/ConnectionSettings.h" +#include "qpid/client/ConnectionOptions.h" #include "qpid/client/Exchange.h" #include "qpid/client/MessageListener.h" #include "qpid/client/Queue.h" @@ -54,7 +54,7 @@ class DummyRun : public TestCase { public: DummyRun() {} - void assign(const string&, FieldTable&, ConnectionSettings&) {} + void assign(const string&, FieldTable&, ConnectionOptions&) {} void start() {} void stop() {} void report(qpid::client::Message&) {} @@ -68,7 +68,7 @@ class Listener : public MessageListener, private Runnable{ typedef boost::ptr_map<string, TestCase> TestMap; Channel& channel; - ConnectionSettings& options; + ConnectionOptions& options; TestMap tests; const string name; const string topic; @@ -86,13 +86,13 @@ class Listener : public MessageListener, private Runnable{ void sendSimpleResponse(const string& type, Message& request); void sendReport(); public: - Listener(Channel& channel, ConnectionSettings& options); + Listener(Channel& channel, ConnectionOptions& options); void received(Message& msg); void bindAndConsume(); void registerTest(string name, TestCase* test); }; -struct TestSettings : ConnectionSettings +struct TestSettings : ConnectionOptions { bool help; @@ -131,7 +131,7 @@ int main(int argc, char** argv) { } } -Listener::Listener(Channel& _channel, ConnectionSettings& _options) : channel(_channel), options(_options), name(options.clientid), topic("iop.control." + name) +Listener::Listener(Channel& _channel, ConnectionOptions& _options) : channel(_channel), options(_options), name(options.clientid), topic("iop.control." + name) {} void Listener::registerTest(string name, TestCase* test) |