* Summary:

	 - Improved plugin framework and HandlerUpdater interface.
	 - Cluster handlers for traffic to/from cluster.
	 - Cluster HandlerUpdater configures channel chains for cluster.
	 - Cluster PluginProvider registers cluster objects with broker.

	* src/qpid/framing/AMQFrame.h: Made data members public. Handlers
	need to be able to modify frame data, getters/setters are just a
	nuisance here.

	* src/tests/Cluster.cpp: Updated for cluster changes, using
	handlers instead of friendship to hook test into Cluster code.

	* src/qpid/framing/amqp_types.h: Added CHANNEL_MAX and
	CHANNEL_HIGH_BIT constants.

	* src/qpid/framing/HandlerUpdater.h: Renamed ChannelInitializer,
	broke dependency on broker channel types.

	* src/qpid/framing/Handler.h: Added constructors and nextHandler()

	* src/qpid/framing/AMQFrame.h (class AMQFrame): Inlined getChannel()

	* src/qpid/cluster/ClusterPluginProvider.cpp: Provider for cluster
	plugins.

	* src/qpid/cluster/Cluster.cpp: Use ChannelManager. Factor out
	plugin details to ClusterPluginProvider.

	* src/qpid/cluster/ChannelManager.h: Insert cluster handlers
	into channel chains, route frames between cluster and channels.
	
	* src/qpid/broker/BrokerAdapter.cpp (startOk): use CHANNEL_MAX
	constant.

	* src/qpid/broker/Broker.cpp:
	 - Refactored for new plugin framework.
	 - Added getUrl().

	* src/qpid/Url.h: Added constructor from Address.

	* src/qpid/Plugin.h: Generalized plugin framework, broke
	dependency on Broker interfaces. We may want to use plug-ins for
	clients also at some point.

	* src/tests/run_test: Fix bug when VALGRIND is not set.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@551981 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 20 insertions, 14 deletions

diff --git a/qpid/cpp/src/tests/Url.cpp b/qpid/cpp/src/tests/Url.cpp
index 09aabb80b3..faf802ba1e 100644
--- a/qpid/cpp/src/tests/Url.cpp
+++ b/qpid/cpp/src/tests/Url.cpp
@@ -30,27 +30,33 @@ BOOST_AUTO_TEST_CASE(testUrl_str) {
     Url url;
     url.push_back(TcpAddress("foo.com"));
     url.push_back(TcpAddress("bar.com", 6789));
-    
-    BOOST_CHECK_EQUAL(
-        url.str(), "amqp:tcp:foo.com:5672,tcp:bar.com:6789");
-    BOOST_CHECK_EQUAL(Url().str(), "amqp:");
+    BOOST_CHECK_EQUAL("amqp:tcp:foo.com:5672,tcp:bar.com:6789", url.str());
+    BOOST_CHECK_EQUAL("amqp:", Url().str());
 }
 
 
-BOOST_AUTO_TEST_CASE(testUrl_ctor) {
-    BOOST_CHECK_EQUAL(
-        Url("amqp:foo.com,tcp:bar.com:1234").str(),
-        "amqp:tcp:foo.com:5672,tcp:bar.com:1234");
-    BOOST_CHECK_EQUAL(
-        Url("amqp:foo/ignorethis").str(),
-        "amqp:tcp:foo:5672");
-    BOOST_CHECK_EQUAL("amqp:tcp::5672", Url("amqp:").str());
-    BOOST_CHECK_EQUAL(0u, Url("xxx", nothrow).size());
+BOOST_AUTO_TEST_CASE(testUrl_parse) {
+    Url url;
+    url.parse("amqp:foo.com,tcp:bar.com:1234");
+    BOOST_CHECK_EQUAL(2u, url.size());
+    BOOST_CHECK_EQUAL("foo.com", boost::get<TcpAddress>(url[0]).host);
+    BOOST_CHECK_EQUAL("amqp:tcp:foo.com:5672,tcp:bar.com:1234", url.str());
+
+    url.parse("amqp:foo/ignorethis");
+    BOOST_CHECK_EQUAL("amqp:tcp:foo:5672", url.str());
+
+    url.parse("amqp:");
+    BOOST_CHECK_EQUAL("amqp:tcp::5672", url.str());
+
     try {
-        Url invalid("xxx");
+        url.parse("invalid url");
         BOOST_FAIL("Expected InvalidUrl exception");
     }
     catch (const Url::InvalidUrl&) {}
+
+    url.parseNoThrow("invalid url");
+    BOOST_CHECK(url.empty());
 }
 
 
+