Consolidated cluster tests in cluster_test.cpp

Improvements to BrokerFixture for testing.


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

1 files changed, 11 insertions, 6 deletions

diff --git a/cpp/src/qpid/Plugin.cpp b/cpp/src/qpid/Plugin.cpp
index 77627c3742..733d134334 100644
--- a/cpp/src/qpid/Plugin.cpp
+++ b/cpp/src/qpid/Plugin.cpp
@@ -19,16 +19,16 @@
  */
 
 #include "Plugin.h"
+#include "qpid/Options.h"
 
 namespace qpid {
 
 namespace {
-// This is a single threaded singleton implementation so
-// it is important to be sure that the first use of this
-// singleton is when the program is still single threaded
 Plugin::Plugins& thePlugins() {
+    // This is a single threaded singleton implementation so
+    // it is important to be sure that the first use of this
+    // singleton is when the program is still single threaded
     static Plugin::Plugins plugins;
-
     return plugins;
 }
 }
@@ -42,8 +42,13 @@ Plugin::~Plugin() {}
 
 Options*  Plugin::getOptions() { return 0; }
 
-const Plugin::Plugins& Plugin::getPlugins() {
-    return thePlugins();
+const Plugin::Plugins& Plugin::getPlugins() { return thePlugins(); }
+
+void Plugin::addOptions(Options& opts) {
+    for (Plugins::const_iterator i = getPlugins().begin(); i != getPlugins().end(); ++i) {
+        if ((*i)->getOptions())
+            opts.add(*(*i)->getOptions());
+    }
 }
 
 } // namespace qpid