1 files changed, 8 insertions, 25 deletions
diff --git a/examples/cppunittest/CppUnitTestSuite.cpp b/examples/cppunittest/CppUnitTestSuite.cpp
index 01f66cd..563caff 100644
--- a/examples/cppunittest/CppUnitTestSuite.cpp
+++ b/examples/cppunittest/CppUnitTestSuite.cpp
@@ -1,34 +1,17 @@
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include "CppUnitTestSuite.h"
+#include <cppunit/extensions/HelperMacros.h>
 #include "CoreSuite.h"
 #include "HelperSuite.h"
 #include "ExtensionSuite.h"
 #include "OutputSuite.h"
 #include "UnitTestToolSuite.h"
 
-
-namespace CppUnitTest
-{
-
-CppUnit::Test *
-suite()
+namespace CppUnitTest 
 {
-  CppUnit::TestFactoryRegistry &registry = 
-                      CppUnit::TestFactoryRegistry::getRegistry();
-
-  registry.registerFactory( 
-      &CppUnit::TestFactoryRegistry::getRegistry( coreSuiteName() ) );
-  registry.registerFactory( 
-      &CppUnit::TestFactoryRegistry::getRegistry( extensionSuiteName() ) );
-  registry.registerFactory( 
-      &CppUnit::TestFactoryRegistry::getRegistry( helperSuiteName() ) );
-  registry.registerFactory( 
-      &CppUnit::TestFactoryRegistry::getRegistry( outputSuiteName() ) );
-  registry.registerFactory( 
-      &CppUnit::TestFactoryRegistry::getRegistry( unitTestToolSuiteName() ) );
-
-  return registry.makeTest();
-}
 
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT( coreSuiteName() );
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT( extensionSuiteName() );
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT( helperSuiteName() );
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT( outputSuiteName() );
+CPPUNIT_REGISTRY_ADD_TO_DEFAULT( unitTestToolSuiteName() );
 
-}  // namespace CppUnitTest
+}
+\ No newline at end of file