From 0d8f56400ceec589ca53eeb6e956cef19112bc17 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 15 Jul 2010 20:33:16 +0000 Subject: QPID-2734: Tighter control over sasl related test; now passes when cyrus-sasl not in use. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964571 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/MessagingFixture.h | 8 ++++++++ qpid/cpp/src/tests/MessagingSessionTests.cpp | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/tests/MessagingFixture.h b/qpid/cpp/src/tests/MessagingFixture.h index c8ae86dbc3..18cdeb1701 100644 --- a/qpid/cpp/src/tests/MessagingFixture.h +++ b/qpid/cpp/src/tests/MessagingFixture.h @@ -113,6 +113,14 @@ struct MessagingFixture : public BrokerFixture return connection; } + /** Open a connection to the broker. */ + qpid::messaging::Connection newConnection() + { + qpid::messaging::Connection connection( + (boost::format("amqp:tcp:localhost:%1%") % (broker->getPort(qpid::broker::Broker::TCP_TRANSPORT))).str()); + return connection; + } + void ping(const qpid::messaging::Address& address) { messaging::Receiver r = session.createReceiver(address); diff --git a/qpid/cpp/src/tests/MessagingSessionTests.cpp b/qpid/cpp/src/tests/MessagingSessionTests.cpp index a23e8c3a9e..268bf3fbd3 100644 --- a/qpid/cpp/src/tests/MessagingSessionTests.cpp +++ b/qpid/cpp/src/tests/MessagingSessionTests.cpp @@ -772,7 +772,12 @@ QPID_AUTO_TEST_CASE(testExclusiveSubscriber) QPID_AUTO_TEST_CASE(testAuthenticatedUsername) { MessagingFixture fix; - BOOST_CHECK_EQUAL(fix.connection.getAuthenticatedUsername(), std::string("anonymous")); + Connection connection = fix.newConnection(); + connection.setOption("sasl-mechanism", "PLAIN"); + connection.setOption("username", "test-user"); + connection.setOption("password", "ignored"); + connection.open(); + BOOST_CHECK_EQUAL(connection.getAuthenticatedUsername(), std::string("test-user")); } QPID_AUTO_TEST_CASE(testExceptionOnClosedConnection) -- cgit v1.2.1