diff options
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/ClusterFixture.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/tests/RetryList.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/tests/Url.cpp | 27 | ||||
| -rwxr-xr-x | cpp/src/tests/ssl_test | 6 |
4 files changed, 24 insertions, 19 deletions
diff --git a/cpp/src/tests/ClusterFixture.cpp b/cpp/src/tests/ClusterFixture.cpp index b7e8e88abf..04a5d35b06 100644 --- a/cpp/src/tests/ClusterFixture.cpp +++ b/cpp/src/tests/ClusterFixture.cpp @@ -153,7 +153,7 @@ std::set<int> knownBrokerPorts(qpid::client::Connection& c, int n) { } std::set<int> s; for (std::vector<qpid::Url>::const_iterator i = urls.begin(); i != urls.end(); ++i) - s.insert((*i)[0].get<qpid::TcpAddress>()->port); + s.insert((*i)[0].port); return s; } diff --git a/cpp/src/tests/RetryList.cpp b/cpp/src/tests/RetryList.cpp index d1d22348a3..50cd5edfe8 100644 --- a/cpp/src/tests/RetryList.cpp +++ b/cpp/src/tests/RetryList.cpp @@ -33,7 +33,7 @@ struct RetryListFixture { RetryList list; std::vector<Url> urls; - std::vector<TcpAddress> expected; + std::vector<Address> expected; void addUrl(const std::string& s) { @@ -42,15 +42,15 @@ struct RetryListFixture void addExpectation(const std::string& host, uint16_t port) { - expected.push_back(TcpAddress(host, port)); + expected.push_back(Address("tcp", host, port)); } void check() { list.reset(urls); for (int t = 0; t < 2; t++) { - TcpAddress next; - for (std::vector<TcpAddress>::const_iterator i = expected.begin(); i != expected.end(); ++i) { + Address next; + for (std::vector<Address>::const_iterator i = expected.begin(); i != expected.end(); ++i) { BOOST_CHECK(list.next(next)); BOOST_CHECK_EQUAL(i->host, next.host); BOOST_CHECK_EQUAL(i->port, next.port); diff --git a/cpp/src/tests/Url.cpp b/cpp/src/tests/Url.cpp index cd5169a21d..df1852dd1d 100644 --- a/cpp/src/tests/Url.cpp +++ b/cpp/src/tests/Url.cpp @@ -37,38 +37,37 @@ QPID_AUTO_TEST_SUITE(UrlTestSuite) QPID_AUTO_TEST_CASE(TestParseTcp) { URL_CHECK_STR("amqp:tcp:host:42"); URL_CHECK_STR("amqp:tcp:host-._~%ff%23:42"); // unreserved chars and pct encoded hex. - // Check defaults BOOST_CHECK_EQUAL(Url("amqp:host:42").str(), "amqp:tcp:host:42"); BOOST_CHECK_EQUAL(Url("amqp:tcp:host").str(), "amqp:tcp:host:5672"); + BOOST_CHECK_EQUAL(Url("host").str(), "amqp:tcp:host:5672"); +} +QPID_AUTO_TEST_CASE(TestParseInvalid) { //host is required: URL_CHECK_INVALID("amqp:tcp:"); URL_CHECK_INVALID("amqp:"); URL_CHECK_INVALID("amqp::42"); + URL_CHECK_INVALID(""); - URL_CHECK_INVALID("amqp::badHost!#$#"); - URL_CHECK_INVALID("amqp::host:badPort"); + // Port must be numeric + URL_CHECK_INVALID("host:badPort"); } -QPID_AUTO_TEST_CASE(TestParseExample) { - URL_CHECK_STR("amqp:example:x"); - URL_CHECK_INVALID("amqp:example:badExample"); +QPID_AUTO_TEST_CASE(TestParseXyz) { + Url::addProtocol("xyz"); + URL_CHECK_STR("amqp:xyz:host:123"); + BOOST_CHECK_EQUAL(Url("xyz:host").str(), "amqp:xyz:host:5672"); } QPID_AUTO_TEST_CASE(TestParseMultiAddress) { - URL_CHECK_STR("amqp:tcp:host:0,example:y,tcp:foo:0,example:1"); - URL_CHECK_STR("amqp:example:z,tcp:foo:0"); + Url::addProtocol("xyz"); + URL_CHECK_STR("amqp:tcp:host:0,xyz:foo:123,tcp:foo:0,xyz:bar:1"); + URL_CHECK_STR("amqp:xyz:foo:222,tcp:foo:0"); URL_CHECK_INVALID("amqp:tcp:h:0,"); URL_CHECK_INVALID(",amqp:tcp:h"); } - -QPID_AUTO_TEST_CASE(TestInvalidAddress) { - URL_CHECK_INVALID("xxxx"); - URL_CHECK_INVALID(""); -} - QPID_AUTO_TEST_SUITE_END() }} // namespace qpid::tests diff --git a/cpp/src/tests/ssl_test b/cpp/src/tests/ssl_test index 36b332f868..1564abb5f5 100755 --- a/cpp/src/tests/ssl_test +++ b/cpp/src/tests/ssl_test @@ -78,5 +78,11 @@ export QPID_NO_MODULE_DIR=1 export QPID_LOAD_MODULE=$SSLCONNECTOR_LIB export QPID_SSL_CERT_DB=${CERT_DIR} export QPID_SSL_CERT_PASSWORD_FILE=${CERT_PW_FILE} +# Test connection via connection settings ./perftest --count ${COUNT} --port ${PORT} -P ssl -b $TEST_HOSTNAME --summary +# Test connection with a URL +URL=amqp:ssl:$TEST_HOSTNAME:$PORT +./qpid_send -b $URL --content-string=hello -a "foo;{create:always}" +MSG=`./qpid_receive -b $URL -a "foo;{create:always}" --messages 1` +test "$MSG" = "hello" || { echo "receive failed '$MSG' != 'hello'"; exit 1; } |