Merged Baptiste Lepilleurs patch for TestRegistry: now TestCases do not automatically register with the Registry anymore.

1 files changed, 15 insertions, 20 deletions

diff --git a/cppunit/TestRegistry.cpp b/cppunit/TestRegistry.cpp
index 5594f30..f4eaf74 100644
--- a/cppunit/TestRegistry.cpp
+++ b/cppunit/TestRegistry.cpp
@@ -1,22 +1,16 @@
 #include "cppunit/TestRegistry.h"
 #include "cppunit/Test.h"
 
-//using namespace std;
-
 namespace CppUnit {
 
-std::vector<std::string> s_registry_names;
-std::vector<Test*> s_registry_tests;
-
-static TestRegistry* s_registry;
-static bool instanciated=false;
+TestRegistry* 
+TestRegistry::s_registry = NULL;
 
 TestRegistry&
 TestRegistry::getRegistry ()
 {
-  if(!instanciated) {
-    s_registry=new TestRegistry();
-    instanciated=true;
+  if (NULL == s_registry) {
+    s_registry = new TestRegistry();
   }
   return *s_registry;
 }
@@ -24,20 +18,20 @@ TestRegistry::getRegistry ()
 void 
 TestRegistry::addTest(std::string name, Test *test)
 { 
-  s_registry_names.push_back (name);
-  s_registry_tests.push_back (test); 
+  getRegistry().m_registry_names.push_back (name);
+  getRegistry().m_registry_tests.push_back (test); 
 }
 
 const std::vector<std::string>&
 TestRegistry::getAllTestNames () const
 {
-  return(s_registry_names);
+  return getRegistry().m_registry_names;
 }
 
 const std::vector<Test*>& 
 TestRegistry::getAllTests() const
 {
-  return(s_registry_tests);
+  return getRegistry().m_registry_tests;
 }
 
 std::vector<Test*> 
@@ -46,9 +40,9 @@ TestRegistry::getTest (const std::string& testCase) const
   std::vector<Test*> res;
   std::vector<Test*>::iterator test_it;
   std::vector<std::string>::iterator name_it;
-  for (test_it = s_registry_tests.begin (),
-       name_it = s_registry_names.begin ();
-       test_it != s_registry_tests.end ();
+  for (test_it = getRegistry().m_registry_tests.begin (),
+       name_it = getRegistry().m_registry_names.begin ();
+       test_it != getRegistry().m_registry_tests.end ();
        ++test_it, ++name_it) {
     if ((*name_it) == testCase) {
       res.push_back((*test_it));
@@ -60,10 +54,11 @@ TestRegistry::getTest (const std::string& testCase) const
 
 TestRegistry::~TestRegistry ()
 {
-    for (std::vector<Test*>::iterator it = s_registry_tests.begin ();
-             it != s_registry_tests.end ();
-             ++it)
+    for (std::vector<Test*>::iterator it = m_registry_tests.begin ();
+         it != m_registry_tests.end ();
+         ++it) {
         delete *it;
+    }
 }
 
 TestRegistry::TestRegistry ()