QPID-1650 Mick Goulish: separte ClusterFixture from cluster_test.cpp for use by other tests.

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

5 files changed, 226 insertions, 83 deletions

diff --git a/qpid/cpp/src/tests/ClusterFixture.cpp b/qpid/cpp/src/tests/ClusterFixture.cpp
new file mode 100644
index 0000000000..7b89aa9b5d
--- /dev/null
+++ b/qpid/cpp/src/tests/ClusterFixture.cpp
@@ -0,0 +1,118 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "test_tools.h"
+#include "unit_test.h"
+#include "ForkedBroker.h"
+#include "BrokerFixture.h"
+
+#include "qpid/client/Connection.h"
+#include "qpid/client/ConnectionAccess.h"
+#include "qpid/client/Session.h"
+#include "qpid/client/FailoverListener.h"
+#include "qpid/cluster/Cluster.h"
+#include "qpid/cluster/Cpg.h"
+#include "qpid/cluster/UpdateClient.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Uuid.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/enum.h"
+#include "qpid/log/Logger.h"
+
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <string>
+#include <iostream>
+#include <iterator>
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <iterator>
+
+
+using namespace std;
+using namespace qpid;
+using namespace qpid::cluster;
+using namespace qpid::framing;
+using namespace qpid::client;
+using qpid::sys::TIME_SEC;
+using qpid::broker::Broker;
+using boost::shared_ptr;
+using qpid::cluster::Cluster;
+
+
+
+#include "ClusterFixture.h"
+
+
+/** Parse broker & cluster options */
+Broker::Options parseOpts(size_t argc, const char* argv[]) {
+    Broker::Options opts;
+    Plugin::addOptions(opts); // Pick up cluster options.
+    opts.parse(argc, argv, "", true); // Allow-unknown for --load-module
+    return opts;
+}
+
+
+
+
+ClusterFixture::ClusterFixture(size_t n, int localIndex_) : name(Uuid(true).str()), localIndex(localIndex_) {
+    add(n);
+}
+
+void ClusterFixture::add() {
+    if (size() != size_t(localIndex))  { // fork a broker process.
+        std::ostringstream os; os << "fork" << size();
+        std::string prefix = os.str();
+        const char* argv[] = {
+            "qpidd " __FILE__ ,
+            "--no-module-dir",
+            "--load-module=../.libs/cluster.so",
+            "--cluster-name", name.c_str(), 
+            "--auth=no", "--no-data-dir",
+            "--log-prefix", prefix.c_str(),
+        };
+        size_t argc = sizeof(argv)/sizeof(argv[0]);
+        forkedBrokers.push_back(shared_ptr<ForkedBroker>(new ForkedBroker(argc, argv)));
+        push_back(forkedBrokers.back()->getPort());
+    }
+    else {                      // Run in this process
+        addLocal();
+    }
+}
+
+void ClusterFixture::addLocal() {
+    assert(int(size()) == localIndex || localIndex == -1);
+    localIndex = size();
+    const char* argv[] = {
+        "qpidd " __FILE__ ,
+        "--load-module=../.libs/cluster.so",
+        "--cluster-name", name.c_str(), 
+        "--auth=no", "--no-data-dir"
+    };
+    size_t argc = sizeof(argv)/sizeof(argv[0]);
+    ostringstream os; os << "local" << localIndex;
+    qpid::log::Logger::instance().setPrefix(os.str());
+    localBroker.reset(new BrokerFixture(parseOpts(argc, argv)));
+    push_back(localBroker->getPort());
+    forkedBrokers.push_back(shared_ptr<ForkedBroker>());
+}
+
+
+
diff --git a/qpid/cpp/src/tests/ClusterFixture.h b/qpid/cpp/src/tests/ClusterFixture.h
new file mode 100644
index 0000000000..1617ce5e5b
--- /dev/null
+++ b/qpid/cpp/src/tests/ClusterFixture.h
@@ -0,0 +1,104 @@
+#ifndef CLUSTER_FIXTURE_H
+#define CLUSTER_FIXTURE_H
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "test_tools.h"
+#include "unit_test.h"
+#include "ForkedBroker.h"
+#include "BrokerFixture.h"
+
+#include "qpid/client/Connection.h"
+#include "qpid/client/ConnectionAccess.h"
+#include "qpid/client/Session.h"
+#include "qpid/client/FailoverListener.h"
+#include "qpid/cluster/Cluster.h"
+#include "qpid/cluster/Cpg.h"
+#include "qpid/cluster/UpdateClient.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Uuid.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/framing/enum.h"
+#include "qpid/log/Logger.h"
+
+#include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <string>
+#include <iostream>
+#include <iterator>
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <iterator>
+
+
+using namespace std;
+using namespace qpid;
+using namespace qpid::cluster;
+using namespace qpid::framing;
+using namespace qpid::client;
+using qpid::sys::TIME_SEC;
+using qpid::broker::Broker;
+using boost::shared_ptr;
+using qpid::cluster::Cluster;
+
+
+
+/** Cluster fixture is a vector of ports for the replicas.
+ * 
+ * At most one replica (by default replica 0) is in the current
+ * process, all others are forked as children.
+ */
+class ClusterFixture : public vector<uint16_t>  {
+    string name;
+    std::auto_ptr<BrokerFixture> localBroker;
+    int localIndex;
+    std::vector<shared_ptr<ForkedBroker> > forkedBrokers;
+
+  public:
+    /** @param localIndex can be -1 meaning don't automatically start a local broker.
+     * A local broker can be started with addLocal().
+     */
+    ClusterFixture(size_t n, int localIndex=0);
+    void add(size_t n) { for (size_t i=0; i < n; ++i) add(); }
+    void add();                 // Add a broker.
+    void addLocal();            // Add a local broker.
+    void setup();
+
+    bool hasLocal() const { return localIndex >= 0 && size_t(localIndex) < size(); }
+    
+    /** Kill a forked broker with sig, or shutdown localBroker if n==0. */
+    void kill(size_t n, int sig=SIGINT) {
+        if (n == size_t(localIndex))
+            localBroker->broker->shutdown();
+        else
+            forkedBrokers[n]->kill(sig);
+    }
+
+    /** Kill a broker and suppressing errors from closing connection c. */
+    void killWithSilencer(size_t n, client::Connection& c, int sig=SIGINT) {
+        ScopedSuppressLogging sl;
+        kill(n,sig);
+        try { c.close(); } catch(...) {}
+    }
+};
+
+
+#endif  /*!CLUSTER_FIXTURE_H*/
diff --git a/qpid/cpp/src/tests/ForkedBroker.h b/qpid/cpp/src/tests/ForkedBroker.h
index 925f8011f2..5d75c9364d 100644
--- a/qpid/cpp/src/tests/ForkedBroker.h
+++ b/qpid/cpp/src/tests/ForkedBroker.h
@@ -1,4 +1,5 @@
 #ifndef TESTS_FORKEDBROKER_H
+#define TESTS_FORKEDBROKER_H
 
 
 /*
diff --git a/qpid/cpp/src/tests/cluster.mk b/qpid/cpp/src/tests/cluster.mk
index d2ee3acf5d..995148fb54 100644
--- a/qpid/cpp/src/tests/cluster.mk
+++ b/qpid/cpp/src/tests/cluster.mk
@@ -33,8 +33,8 @@ TESTS+=ais_check
 EXTRA_DIST+=ais_check start_cluster stop_cluster restart_cluster cluster_python_tests cluster_python_tests_failing.txt
 
 check_PROGRAMS+=cluster_test
-cluster_test_SOURCES=unit_test.cpp cluster_test.cpp
-cluster_test_LDADD=$(lib_client) ../cluster.la -lboost_unit_test_framework
+cluster_test_SOURCES=unit_test.cpp cluster_test.cpp ClusterFixture.cpp ClusterFixture.h
+cluster_test_LDADD=$(lib_client) ../cluster.la -lboost_unit_test_framework 
 
 unit_test_LDADD+=../cluster.la
 
diff --git a/qpid/cpp/src/tests/cluster_test.cpp b/qpid/cpp/src/tests/cluster_test.cpp
index 585c981afc..6ee42be194 100644
--- a/qpid/cpp/src/tests/cluster_test.cpp
+++ b/qpid/cpp/src/tests/cluster_test.cpp
@@ -20,6 +20,7 @@
 #include "unit_test.h"
 #include "ForkedBroker.h"
 #include "BrokerFixture.h"
+#include "ClusterFixture.h"
 
 #include "qpid/client/Connection.h"
 #include "qpid/client/ConnectionAccess.h"
@@ -71,87 +72,6 @@ Broker::Options parseOpts(size_t argc, const char* argv[]) {
     return opts;
 }
 
-/** Cluster fixture is a vector of ports for the replicas.
- * 
- * At most one replica (by default replica 0) is in the current
- * process, all others are forked as children.
- */
-class ClusterFixture : public vector<uint16_t>  {
-    string name;
-    std::auto_ptr<BrokerFixture> localBroker;
-    int localIndex;
-    std::vector<shared_ptr<ForkedBroker> > forkedBrokers;
-
-  public:
-    /** @param localIndex can be -1 meaning don't automatically start a local broker.
-     * A local broker can be started with addLocal().
-     */
-    ClusterFixture(size_t n, int localIndex=0);
-    void add(size_t n) { for (size_t i=0; i < n; ++i) add(); }
-    void add();                 // Add a broker.
-    void addLocal();            // Add a local broker.
-    void setup();
-
-    bool hasLocal() const { return localIndex >= 0 && size_t(localIndex) < size(); }
-    
-    /** Kill a forked broker with sig, or shutdown localBroker if n==0. */
-    void kill(size_t n, int sig=SIGINT) {
-        if (n == size_t(localIndex))
-            localBroker->broker->shutdown();
-        else
-            forkedBrokers[n]->kill(sig);
-    }
-
-    /** Kill a broker and suppress errors from connection. */
-    void killWithSilencer(size_t n, client::Connection& c, int sig=SIGINT) {
-        ScopedSuppressLogging sl;
-        kill(n,sig);
-        try { c.close(); } catch(...) {}
-    }
-};
-
-ClusterFixture::ClusterFixture(size_t n, int localIndex_) : name(Uuid(true).str()), localIndex(localIndex_) {
-    add(n);
-}
-
-void ClusterFixture::add() {
-    if (size() != size_t(localIndex))  { // fork a broker process.
-        std::ostringstream os; os << "fork" << size();
-        std::string prefix = os.str();
-        const char* argv[] = {
-            "qpidd " __FILE__ ,
-            "--no-module-dir",
-            "--load-module=../.libs/cluster.so",
-            "--cluster-name", name.c_str(), 
-            "--auth=no", "--no-data-dir",
-            "--log-prefix", prefix.c_str(),
-        };
-        size_t argc = sizeof(argv)/sizeof(argv[0]);
-        forkedBrokers.push_back(shared_ptr<ForkedBroker>(new ForkedBroker(argc, argv)));
-        push_back(forkedBrokers.back()->getPort());
-    }
-    else {                      // Run in this process
-        addLocal();
-    }
-}
-
-void ClusterFixture::addLocal() {
-    assert(int(size()) == localIndex || localIndex == -1);
-    localIndex = size();
-    const char* argv[] = {
-        "qpidd " __FILE__ ,
-        "--load-module=../.libs/cluster.so",
-        "--cluster-name", name.c_str(), 
-        "--auth=no", "--no-data-dir"
-    };
-    size_t argc = sizeof(argv)/sizeof(argv[0]);
-    ostringstream os; os << "local" << localIndex;
-    qpid::log::Logger::instance().setPrefix(os.str());
-    localBroker.reset(new BrokerFixture(parseOpts(argc, argv)));
-    push_back(localBroker->getPort());
-    forkedBrokers.push_back(shared_ptr<ForkedBroker>());
-}
-
 ostream& operator<<(ostream& o, const cpg_name* n) {
     return o << qpid::cluster::Cpg::str(*n);
 }