2007-06-25 <aconway@redhat.com>

	Cluster class implementing cluster membership map.
	* src/qpid/cluster/Cluster.cpp: Cluster membership implementation.
	* src/qpid/cluster/Cpg.cpp: Support for boost::function callbacks.
	* src/tests/Url.cpp: Implements AMQP-95 URL format.
	* xml/cluster.xml: Cluster join method.

	Build/packaging
	* README: Remove mention of openais till clustering is functional.
	For now it is optional and we depend on an unpackaged version. 
	* configure.ac: Check openais has cpg_local_get().
	* Makefile.am: Added cluster.xml to EXTRA_DIST.
	* src/generate.sh: add cluster.xml to codegen.
	* src/tests/Makefile.am:
	 - Generate individual "sudo -u ais" wrappers for openais tests.
	 - Drop "unit" directory, all unit tests in "tests" directory

	Minor changes:
	* src/qpid/sys/posix/Socket.cpp:
	* src/qpid/sys/posix/PosixAcceptor.cpp: 
	* src/qpid/sys/posix/EventChannelAcceptor.cpp: 
	* src/qpid/sys/apr/APRAcceptor.cpp: 
	* src/qpid/sys/Acceptor.h (getHost): Added getHost()
	* src/tests/.valgrind.supp-default: Suppress benign valgrind
	warning in libcpg.


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

1 files changed, 56 insertions, 0 deletions

diff --git a/cpp/src/tests/Url.cpp b/cpp/src/tests/Url.cpp
new file mode 100644
index 0000000000..09aabb80b3
--- /dev/null
+++ b/cpp/src/tests/Url.cpp
@@ -0,0 +1,56 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ *
+ */
+
+#define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>
+#include <boost/test/auto_unit_test.hpp>
+#include "test_tools.h"
+#include "qpid/Url.h"
+#include <boost/assign.hpp>
+
+using namespace std;
+using namespace qpid;
+using namespace boost::assign;
+
+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_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());
+    try {
+        Url invalid("xxx");
+        BOOST_FAIL("Expected InvalidUrl exception");
+    }
+    catch (const Url::InvalidUrl&) {}
+}
+
+