diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/ConnectionOptions.h | 53 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | cpp/src/tests/TestOptions.h | 4 |
3 files changed, 3 insertions, 57 deletions
diff --git a/cpp/src/tests/ConnectionOptions.h b/cpp/src/tests/ConnectionOptions.h deleted file mode 100644 index 3be0528612..0000000000 --- a/cpp/src/tests/ConnectionOptions.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef QPID_CLIENT_CONNECTIONOPTIONS_H -#define QPID_CLIENT_CONNECTIONOPTIONS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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 - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "ConnectionOptions.h" -#include "qpid/Options.h" - -/** - * Options parser for ConnectionOptions. - */ -struct ConnectionOptions : public qpid::Options, - public qpid::client::ConnectionSettings -{ - ConnectionOptions() : qpid::Options("Connection Settings") - { - using namespace qpid; - addOptions() - ("broker,b", optValue(host, "HOST"), "Broker host to connect to") - ("port,p", optValue(port, "PORT"), "Broker port to connect to") - ("virtualhost,v", optValue(virtualhost, "VHOST"), "virtual host") - ("clientname,n", optValue(clientid, "ID"), "unique client identifier") - ("username", optValue(username, "USER"), "user name for broker log in.") - ("password", optValue(password, "PASSWORD"), "password for broker log in.") - ("mechanism", optValue(mechanism, "MECH"), "SASL mechanism to use when authenticating.") - ("locale", optValue(locale, "LOCALE"), "locale to use.") - ("max-channels", optValue(maxChannels, "N"), "the maximum number of channels the client requires.") - ("max-frame-size", optValue(maxFrameSize, "N"), "the maximum frame size to request.") - ("bounds-multiplier", optValue(bounds, "N"), - "bound size of write queue (as a multiple of the max frame size)."); - } -}; - -#endif /*!QPID_CLIENT_CONNECTIONOPTIONS_H*/ diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 1751d26808..41e7c525cf 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -63,8 +63,7 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \ TxAckTest.cpp \ TxBufferTest.cpp \ TxPublishTest.cpp \ - MessageBuilderTest.cpp \ - ConnectionOptions.h + MessageBuilderTest.cpp if HAVE_XML unit_test_SOURCES+= XmlClientSessionTest.cpp diff --git a/cpp/src/tests/TestOptions.h b/cpp/src/tests/TestOptions.h index a400fe5ecb..365db59637 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 "qpid/client/ConnectionOptions.h" #include <iostream> #include <exception> @@ -69,7 +69,7 @@ struct TestOptions : public qpid::Options bool help; - ConnectionOptions con; + qpid::client::ConnectionOptions con; qpid::log::Options log; std::string helpText; }; |