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, 72 insertions, 0 deletions

diff --git a/cpp/src/tests/Cluster.cpp b/cpp/src/tests/Cluster.cpp
new file mode 100644
index 0000000000..ed50cc5d7b
--- /dev/null
+++ b/cpp/src/tests/Cluster.cpp
@@ -0,0 +1,72 @@
+/*
+ *
+ * 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 "Cluster.h"
+#include "qpid/framing/ChannelOkBody.h"
+#include "qpid/framing/BasicGetOkBody.h"
+
+
+
+static const ProtocolVersion VER;
+
+/** Verify membership ind a cluster with one member. */
+BOOST_AUTO_TEST_CASE(clusterOne) {
+    VectorFrameHandler received;
+    Cluster cluster("Test", "amqp:one:1", received, VER);
+    AMQFrame frame(VER, 1, new ChannelOkBody(VER));
+
+    cluster.handle(frame);
+    BOOST_REQUIRE(received.waitFor(1));
+    BOOST_CHECK_EQUAL(1u, cluster.size());
+    Cluster::MemberList members = cluster.getMembers();
+    BOOST_CHECK_EQUAL(1u, members.size());
+    BOOST_REQUIRE_EQUAL(members.front()->url, "amqp:one:1");
+    BOOST_CHECK_EQUAL(1u, received.size());
+    BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody());
+}
+
+/** Fork a process to verify membership in a cluster with two members */
+BOOST_AUTO_TEST_CASE(clusterTwo) {
+    VectorFrameHandler received;
+    pid_t pid=fork();
+    BOOST_REQUIRE(pid >= 0);
+    if (pid) {                  // Parent
+        TestCluster cluster("Test", "amqp::1", received, VER);
+        BOOST_REQUIRE(cluster.waitFor(2));
+
+        // Exchange frames with child.
+        AMQFrame frame(VER, 1, new ChannelOkBody(VER));
+        cluster.handle(frame);
+        BOOST_REQUIRE(received.waitFor(2));
+        BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody());
+        BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *received[1].getBody());
+
+        // Wait for child to exit.
+        int status;
+        BOOST_CHECK_EQUAL(::wait(&status), pid);
+        BOOST_CHECK_EQUAL(0, status);
+        BOOST_CHECK(cluster.waitFor(1));
+        BOOST_CHECK_EQUAL(1u, cluster.size());
+    }
+    else {                      // Child
+        BOOST_REQUIRE(execl("Cluster_child", "Cluster_child", NULL));
+    }
+}