* src/tests/ais_check, cluster.mk: Run AIS tests only if:

	 - CLUSTER makefile conditional set by configure.
	 - Effective gid == ais
	 - aisexec is running
	Otherwise print a warning. 

	* src/tests/EventChannelConnectionTest.cpp
	* src/qpid/cluster/doxygen_overview.h
	Removed unused files.


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

3 files changed, 42 insertions, 121 deletions

diff --git a/cpp/src/tests/EventChannelConnectionTest.cpp b/cpp/src/tests/EventChannelConnectionTest.cpp
deleted file mode 100644
index 28eea2fd20..0000000000
--- a/cpp/src/tests/EventChannelConnectionTest.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- *
- */
-
-#include <iostream>
-#include <boost/bind.hpp>
-#include "qpid/framing/AMQHeartbeatBody.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/sys/posix/EventChannelConnection.h"
-#include "qpid/sys/ConnectionInputHandler.h"
-#include "qpid/sys/ConnectionInputHandlerFactory.h"
-#include "qpid/sys/Socket.h"
-#include "qpid_test_plugin.h"
-#include "MockConnectionInputHandler.h"
-
-using namespace qpid::sys;
-using namespace qpid::framing;
-using namespace std;
-
-class EventChannelConnectionTest : public CppUnit::TestCase  
-{
-    CPPUNIT_TEST_SUITE(EventChannelConnectionTest);
-    CPPUNIT_TEST(testSendReceive);
-    CPPUNIT_TEST(testCloseExternal);
-    CPPUNIT_TEST(testCloseException);
-    CPPUNIT_TEST_SUITE_END();
-
-  public:
-
-    void setUp() {
-        threads = EventChannelThreads::create();
-        CPPUNIT_ASSERT_EQUAL(0, ::pipe(pipe));
-        connection.reset(
-            new EventChannelConnection(threads, factory, pipe[0], pipe[1]));
-        CPPUNIT_ASSERT(factory.handler != 0);
-    }
-
-    void tearDown() {
-        threads->shutdown();
-        threads->join();
-    }
-
-    void testSendReceive()
-    {
-        // Send a protocol initiation.
-        Buffer buf(1024);
-        ProtocolInitiation(4,2).encode(buf);
-        buf.flip();
-        ssize_t n = write(pipe[1], buf.start(), buf.available());
-        CPPUNIT_ASSERT_EQUAL(ssize_t(buf.available()), n);
-
-        // Verify session handler got the protocol init.
-        ProtocolInitiation init = factory.handler->waitForProtocolInit();
-        CPPUNIT_ASSERT_EQUAL(int(4), int(init.getMajor()));
-        CPPUNIT_ASSERT_EQUAL(int(2), int(init.getMinor()));
-
-        // Send a heartbeat frame, verify connection got it.
-        connection->send(new AMQFrame(42, new AMQHeartbeatBody()));
-        AMQFrame frame = factory.handler->waitForFrame();
-        CPPUNIT_ASSERT_EQUAL(uint16_t(42), frame.getChannel());
-        CPPUNIT_ASSERT_EQUAL(uint8_t(HEARTBEAT_BODY),
-                             frame.getBody()->type());
-        threads->shutdown();
-    }
-
-    // Make sure the handler is closed if the connection is closed.
-    void testCloseExternal() {
-        connection->close();
-        factory.handler->waitForClosed();
-    }
-
-    // Make sure the handler is closed if the connection closes or fails.
-    // TODO aconway 2006-12-18: logs exception message in test output.
-    void testCloseException() {
-        ::close(pipe[0]);
-        ::close(pipe[1]);
-        // TODO aconway 2006-12-18: Shouldn't this be failing?
-        connection->send(new AMQFrame(42, new AMQHeartbeatBody()));
-        factory.handler->waitForClosed();
-    }
-
-  private:
-    EventChannelThreads::shared_ptr threads;
-    int pipe[2];
-    std::auto_ptr<EventChannelConnection> connection;
-    MockConnectionInputHandlerFactory factory;
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(EventChannelConnectionTest);
-
diff --git a/cpp/src/tests/ais_check b/cpp/src/tests/ais_check
index df40899065..156a8b1ebe 100755
--- a/cpp/src/tests/ais_check
+++ b/cpp/src/tests/ais_check
@@ -1,16 +1,39 @@
 #!/bin/sh
-test `id -ng` = "ais" || {
+# Check for requirements, run AIS tests if found.
+#
+
+test `id -ng` = "ais" || BADGROUP=yes
+ps -u root | grep aisexec > /dev/null 2>&1 || NOAISEXEC=yes
+
+if test -n "$BADGROUP" -o -n "$NOAISEXEC"; then
     cat <<EOF
-    =========================== NOTICE==============================
 
-    You do not appear to have you group ID set to "ais".
+    =========== WARNING: NOT RUNNING AIS TESTS ==============
+
+    Tests that depend on the openais library (used for clustering)
+    will not be run because:
+
+EOF
+    test -n"$BADGROUP" || cat <<EOF
+    You do not appear to have you group ID set to "ais". Make ais your
+    primary group, or run "newgrp ais" before running the tests.
+
+EOF
+    test -n "$NOAISEXEC" || cat <<EOF    
+    The aisexec daemon is not running. Make sure /etc/ais/openais.conf
+    is a valid configuration and aisexec is run by root.
+EOF
 
-    Cluster tests that require the openais library will fail.Make sure
-    you are a member of group ais and run "newgrp ais" before running
-    the tests.
+    cat <<EOF
 
-    ================================================================
+    ==========================================================
     
 EOF
-exit 1;
-}
+    exit 0;			# A warning, not a failure.
+fi
+
+FAILED=0
+for test in `cat ais_tests`; do
+    $srcdir/$test || FAILED=`expr $FAILED + 1`
+done
+exit $FAILED
diff --git a/cpp/src/tests/cluster.mk b/cpp/src/tests/cluster.mk
index 68725758fa..8b603efb14 100644
--- a/cpp/src/tests/cluster.mk
+++ b/cpp/src/tests/cluster.mk
@@ -12,16 +12,23 @@ lib_cluster = $(abs_builddir)/../libqpidcluster.la
 # Cluster tests.
 # 
 
+# ais_check runs ais if the conditions to run AIS tests
+# are met, otherwise it prints a warning.
 TESTS+=ais_check
 EXTRA_DIST+=ais_check
+AIS_TESTS=
 
-TESTS+=Cpg
+ais_check: ais_tests
+ais_tests:
+	echo $(AIS_TESTS) >$@
+
+AIS_TESTS+=Cpg
 check_PROGRAMS+=Cpg
 Cpg_SOURCES=Cpg.cpp
 Cpg_LDADD=$(lib_cluster) -lboost_unit_test_framework
 
 # TODO aconway 2007-07-26: Fix this test.
-#TESTS+=Cluster
+#AIS_TESTS+=Cluster
 check_PROGRAMS+=Cluster
 Cluster_SOURCES=Cluster.cpp Cluster.h
 Cluster_LDADD=$(lib_cluster) -lboost_unit_test_framework
@@ -31,7 +38,7 @@ Cluster_child_SOURCES=Cluster_child.cpp Cluster.h
 Cluster_child_LDADD=$(lib_cluster) -lboost_test_exec_monitor
 
 # TODO aconway 2007-07-03: In progress
-#TESTS+=cluster_client
+#AIS_TESTS+=cluster_client
 check_PROGRAMS+=cluster_client
 cluster_client_SOURCES=cluster_client.cpp
 cluster_client_LDADD=$(lib_client) -lboost_unit_test_framework