Include/cppunit/extensions/TestFactoryRegistry.

include/cppunit/extensions/TestFactoryRegistry.h
* src/cppunit/TestFactoryRegistry.cpp : fixed memory leaks that
occured when a TestFactoryRegistry was registered into another
TestFactoryRegistry.

* include/cppunit/extensions/AutoRegisterSuite.h : updated doc.

* include/cppunit/extensions/HelperMacros.h : added macro
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION to register a suite into
a named suite. Updated doc.

* examples/cppunittest/CoreSuite.h:
* examples/cppunittest/ExtensionSuite.h:
* examples/cppunittest/HelperSuite.h: added, declaration of suite for
use with CPPUNIT_TEST_SUITE_NAMED_REGISTRATION.

* examples/cppunittest/makefile.am : added HelperSuite.h, CoreSuite.h,
ExtensionSuite.h, CppUnitTestSuite.h and CppUnitTestSuite.cpp.

* examples/cppunittest/CppUnitTestSuite.*: added.

* examples/cppunittest/ExceptionTest.cpp:
* examples/cppunittest/TestAssertTest.cpp:
* examples/cppunittest/TestCaseTest.cpp:
* examples/cppunittest/TestFailureTest.cpp:
* examples/cppunittest/TestListenerTest.cpp:
* examples/cppunittest/TestResultTest.cpp:
* examples/cppunittest/TestSuiteTest.cpp: moved into named suite
"Core" using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION.

* examples/cppunittest/OrthodoxTest.cpp:
* examples/cppunittest/RepeatedTest.cpp:
* examples/cppunittest/TestDecoratorTest.cpp:
* examples/cppunittest/TestSetUpTest.cpp: moved into named suite
"Extension" using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION.

* examples/cppunittest/HelperMacrosTest.cpp:
* examples/cppunittest/TestCallerTest.cpp: moved into named suite
"Helper" using CPPUNIT_TEST_SUITE_NAMED_REGISTRATION.

* examples/cppunittest/CppUnitTest.dsp :
* examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp : added
Makefile.am, HelperSuite.h, CoreSuite.h, ExtensionSuite.h,
CppUnitTestSuite.h and CppUnitTestSuite.cpp.

21 files changed, 168 insertions, 20 deletions

diff --git a/examples/cppunittest/CoreSuite.h b/examples/cppunittest/CoreSuite.h
new file mode 100644
index 0000000..9927925
--- /dev/null
+++ b/examples/cppunittest/CoreSuite.h
@@ -0,0 +1,16 @@
+#ifndef CPPUNITTEST_CORESUITE_H
+#define CPPUNITTEST_CORESUITE_H
+
+#include <string>
+
+namespace CppUnitTest
+{
+
+  inline std::string coreSuiteName()
+  {
+    return "Core";
+  }
+
+}
+
+#endif // CPPUNITTEST_CORESUITE_H
\ No newline at end of file
diff --git a/examples/cppunittest/CppUnitTestMain.cpp b/examples/cppunittest/CppUnitTestMain.cpp
index a3043ad..baa8b39 100644
--- a/examples/cppunittest/CppUnitTestMain.cpp
+++ b/examples/cppunittest/CppUnitTestMain.cpp
@@ -1,11 +1,12 @@
 #include <cppunit/TextTestRunner.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
+#include "CppUnitTestSuite.h"
 
 int 
 main( int argc, char* argv[] )
 {
   CppUnit::TextTestRunner runner;
-  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+  runner.addTest( CppUnitTest::suite() );
 
   runner.run();
 
diff --git a/examples/cppunittest/CppUnitTestMain.dsp b/examples/cppunittest/CppUnitTestMain.dsp
index 795d8a8..bb396d7 100644
--- a/examples/cppunittest/CppUnitTestMain.dsp
+++ b/examples/cppunittest/CppUnitTestMain.dsp
@@ -123,10 +123,22 @@ SOURCE=.\BaseTestCase.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CoreSuite.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CppUnitTestMain.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\CppUnitTestSuite.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\CppUnitTestSuite.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ExceptionTest.cpp
 # End Source File
 # Begin Source File
@@ -135,6 +147,10 @@ SOURCE=.\ExceptionTest.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ExtensionSuite.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\FailingTestCase.cpp
 # End Source File
 # Begin Source File
@@ -155,6 +171,14 @@ SOURCE=.\HelperMacrosTest.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\HelperSuite.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Makefile.am
+# End Source File
+# Begin Source File
+
 SOURCE=.\MockTestListener.cpp
 # End Source File
 # Begin Source File
diff --git a/examples/cppunittest/CppUnitTestSuite.cpp b/examples/cppunittest/CppUnitTestSuite.cpp
new file mode 100644
index 0000000..886b942
--- /dev/null
+++ b/examples/cppunittest/CppUnitTestSuite.cpp
@@ -0,0 +1,28 @@
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include "CppUnitTestSuite.h"
+#include "CoreSuite.h"
+#include "HelperSuite.h"
+#include "ExtensionSuite.h"
+
+
+namespace CppUnitTest
+{
+
+CppUnit::Test *
+suite()
+{
+  CppUnit::TestFactoryRegistry &registry = 
+                      CppUnit::TestFactoryRegistry::getRegistry();
+
+  registry.registerFactory( 
+      &CppUnit::TestFactoryRegistry::getRegistry( coreSuiteName() ) );
+  registry.registerFactory( 
+      &CppUnit::TestFactoryRegistry::getRegistry( helperSuiteName() ) );
+  registry.registerFactory( 
+      &CppUnit::TestFactoryRegistry::getRegistry( extensionSuiteName() ) );
+
+  return registry.makeTest();
+}
+
+
+}  // namespace CppUnitTest
diff --git a/examples/cppunittest/CppUnitTestSuite.h b/examples/cppunittest/CppUnitTestSuite.h
new file mode 100644
index 0000000..e6a9563
--- /dev/null
+++ b/examples/cppunittest/CppUnitTestSuite.h
@@ -0,0 +1,16 @@
+#ifndef CPPUNITTESTSUITE_H
+#define CPPUNITTESTSUITE_H
+
+#include <cppunit/TestSuite.h>
+
+
+/*! \class CppUnitTestSuite
+ * \brief This class is a test suite that includes all CppUnit unit tests.
+ */
+namespace CppUnitTest
+{
+  CppUnit::Test *suite();
+} // namespace CppUnitTest
+
+
+#endif  // CPPUNITTESTSUITE_H
diff --git a/examples/cppunittest/ExceptionTest.cpp b/examples/cppunittest/ExceptionTest.cpp
index c56082e..ae4948c 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -1,10 +1,12 @@
+#include "CoreSuite.h"
 #include "ExceptionTest.h"
 #include <cppunit/Exception.h>
 #include <cppunit/NotEqualException.h>
 #include <memory>
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( ExceptionTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExceptionTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 ExceptionTest::ExceptionTest()
diff --git a/examples/cppunittest/ExtensionSuite.h b/examples/cppunittest/ExtensionSuite.h
new file mode 100644
index 0000000..0c87421
--- /dev/null
+++ b/examples/cppunittest/ExtensionSuite.h
@@ -0,0 +1,16 @@
+#ifndef CPPUNITTEST_EXTENSIONSSUITE_H
+#define CPPUNITTEST_EXTENSIONSSUITE_H
+
+#include <string>
+
+namespace CppUnitTest
+{
+
+  inline std::string extensionSuiteName()
+  {
+    return "Extensions";
+  }
+
+}
+
+#endif // CPPUNITTEST_EXTENSIONSSUITE_H
\ No newline at end of file
diff --git a/examples/cppunittest/HelperMacrosTest.cpp b/examples/cppunittest/HelperMacrosTest.cpp
index f6720f0..362bb7e 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -1,8 +1,9 @@
-#include <cppunit/TestResult.h>
-#include <memory>
 #include "FailureException.h"
 #include "HelperMacrosTest.h"
+#include "HelperSuite.h"
 #include "SubclassedTestCase.h"
+#include <cppunit/TestResult.h>
+#include <memory>
 
 /* Note:
  - no unit test for CPPUNIT_TEST_SUITE_REGISTRATION...
@@ -59,7 +60,8 @@ public:
 
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( HelperMacrosTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HelperMacrosTest, 
+                                       CppUnitTest::helperSuiteName() );
 
 
 HelperMacrosTest::HelperMacrosTest() : 
diff --git a/examples/cppunittest/HelperSuite.h b/examples/cppunittest/HelperSuite.h
new file mode 100644
index 0000000..d77a00f
--- /dev/null
+++ b/examples/cppunittest/HelperSuite.h
@@ -0,0 +1,16 @@
+#ifndef CPPUNITTEST_HELPERSUITE_H
+#define CPPUNITTEST_HELPERSUITE_H
+
+#include <string>
+
+namespace CppUnitTest
+{
+
+  inline std::string helperSuiteName()
+  {
+    return "Helpers";
+  }
+
+}
+
+#endif // CPPUNITTEST_HELPERSUITE_H
\ No newline at end of file
diff --git a/examples/cppunittest/Makefile.am b/examples/cppunittest/Makefile.am
index 080c7c4..ea76d95 100644
--- a/examples/cppunittest/Makefile.am
+++ b/examples/cppunittest/Makefile.am
@@ -8,14 +8,19 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
 cppunittestmain_SOURCES = \
 	BaseTestCase.cpp \
 	BaseTestCase.h \
+	CoreSuite.h \
 	CppUnitTestMain.cpp \
+	CppUnitTestSuite.cpp \
+	CppUnitTestSuite.h \
 	ExceptionTest.cpp \
 	ExceptionTest.h \
+	ExtensionSuite.h \
 	FailingTestCase.cpp \
 	FailingTestCase.h \
 	FailureException.h \
 	HelperMacrosTest.cpp \
 	HelperMacrosTest.h \
+	HelperSuite.h \
 	MockTestListener.cpp \
 	MockTestListener.h \
 	NotEqualExceptionTest.cpp \
diff --git a/examples/cppunittest/OrthodoxTest.cpp b/examples/cppunittest/OrthodoxTest.cpp
index 5e472df..390163f 100644
--- a/examples/cppunittest/OrthodoxTest.cpp
+++ b/examples/cppunittest/OrthodoxTest.cpp
@@ -1,8 +1,10 @@
+#include "ExtensionSuite.h"
 #include "OrthodoxTest.h"
 #include <cppunit/extensions/Orthodox.h>
 #include <cppunit/TestResult.h>
 
-CPPUNIT_TEST_SUITE_REGISTRATION( OrthodoxTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( OrthodoxTest,
+                                       CppUnitTest::extensionSuiteName() );
 
 OrthodoxTest::OrthodoxTest()
 {
diff --git a/examples/cppunittest/RepeatedTestTest.cpp b/examples/cppunittest/RepeatedTestTest.cpp
index 883575d..9dfdf6f 100644
--- a/examples/cppunittest/RepeatedTestTest.cpp
+++ b/examples/cppunittest/RepeatedTestTest.cpp
@@ -1,8 +1,10 @@
+#include "ExtensionSuite.h"
 #include "RepeatedTestTest.h"
 #include <cppunit/extensions/RepeatedTest.h>
 #include <cppunit/TestResult.h>
 
-CPPUNIT_TEST_SUITE_REGISTRATION( RepeatedTestTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RepeatedTestTest,
+                                       CppUnitTest::extensionSuiteName() );
 
 
 RepeatedTestTest::RepeatedTestTest() :
diff --git a/examples/cppunittest/TestAssertTest.cpp b/examples/cppunittest/TestAssertTest.cpp
index c87cdb9..96eaa7f 100644
--- a/examples/cppunittest/TestAssertTest.cpp
+++ b/examples/cppunittest/TestAssertTest.cpp
@@ -1,3 +1,4 @@
+#include "CoreSuite.h"
 #include "TestAssertTest.h"
 #include <algorithm>
 
@@ -11,7 +12,8 @@
  */
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestAssertTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestAssertTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 TestAssertTest::TestAssertTest()
diff --git a/examples/cppunittest/TestCallerTest.cpp b/examples/cppunittest/TestCallerTest.cpp
index 929cb39..5584696 100644
--- a/examples/cppunittest/TestCallerTest.cpp
+++ b/examples/cppunittest/TestCallerTest.cpp
@@ -1,10 +1,12 @@
-#include "TestCallerTest.h"
 #include "FailureException.h"
+#include "HelperSuite.h"
+#include "TestCallerTest.h"
 #include <cppunit/extensions/TestSuiteBuilder.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestCallerTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCallerTest, 
+                                       CppUnitTest::helperSuiteName() );
 
 
 void 
diff --git a/examples/cppunittest/TestCaseTest.cpp b/examples/cppunittest/TestCaseTest.cpp
index d749938..81e0c4a 100644
--- a/examples/cppunittest/TestCaseTest.cpp
+++ b/examples/cppunittest/TestCaseTest.cpp
@@ -1,3 +1,4 @@
+#include "CoreSuite.h"
 #include "TestCaseTest.h"
 #include "FailingTestCase.h"
 #include <cppunit/TestResult.h>
@@ -7,7 +8,8 @@
    tests need to be added to check the other aspect of TestCase.
  */
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestCaseTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCaseTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 TestCaseTest::TestCaseTest()
diff --git a/examples/cppunittest/TestDecoratorTest.cpp b/examples/cppunittest/TestDecoratorTest.cpp
index f05fce5..0bf17fd 100644
--- a/examples/cppunittest/TestDecoratorTest.cpp
+++ b/examples/cppunittest/TestDecoratorTest.cpp
@@ -1,9 +1,11 @@
-#include "TestDecoratorTest.h"
+#include "ExtensionSuite.h"
 #include "FailingTestCase.h"
+#include "TestDecoratorTest.h"
 #include <cppunit/TestResult.h>
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestDecoratorTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestDecoratorTest,
+                                       CppUnitTest::extensionSuiteName() );
 
 
 TestDecoratorTest::TestDecoratorTest()
diff --git a/examples/cppunittest/TestFailureTest.cpp b/examples/cppunittest/TestFailureTest.cpp
index c6b5736..8e52268 100644
--- a/examples/cppunittest/TestFailureTest.cpp
+++ b/examples/cppunittest/TestFailureTest.cpp
@@ -1,9 +1,11 @@
+#include "CoreSuite.h"
 #include "TestFailureTest.h"
 #include <cppunit/TestFailure.h>
 #include <cppunit/Exception.h>
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestFailureTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestFailureTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 TestFailureTest::TestFailureTest()
diff --git a/examples/cppunittest/TestListenerTest.cpp b/examples/cppunittest/TestListenerTest.cpp
index a45b0e3..112c988 100644
--- a/examples/cppunittest/TestListenerTest.cpp
+++ b/examples/cppunittest/TestListenerTest.cpp
@@ -1,10 +1,12 @@
+#include "CoreSuite.h"
+#include "MockTestListener.h"
 #include "TestListenerTest.h"
 #include <cppunit/extensions/TestSuiteBuilder.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestResult.h>
-#include "MockTestListener.h"
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestListenerTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestListenerTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 TestListenerTest::TestListenerTest() : 
diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index 53fc9a3..664dca5 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -1,3 +1,4 @@
+#include "CoreSuite.h"
 #include "TestResultTest.h"
 #include <cppunit/TestResult.h>
 
@@ -8,7 +9,8 @@
  */
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestResultTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 TestResultTest::TestResultTest()
diff --git a/examples/cppunittest/TestSetUpTest.cpp b/examples/cppunittest/TestSetUpTest.cpp
index b16933b..06671d8 100644
--- a/examples/cppunittest/TestSetUpTest.cpp
+++ b/examples/cppunittest/TestSetUpTest.cpp
@@ -1,7 +1,9 @@
+#include "ExtensionSuite.h"
 #include "TestSetUpTest.h"
 #include <cppunit/TestResult.h>
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSetUpTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSetUpTest,
+                                       CppUnitTest::extensionSuiteName() );
 
 
 TestSetUpTest::TestSetUpTest()
diff --git a/examples/cppunittest/TestSuiteTest.cpp b/examples/cppunittest/TestSuiteTest.cpp
index b13c7ac..61de964 100644
--- a/examples/cppunittest/TestSuiteTest.cpp
+++ b/examples/cppunittest/TestSuiteTest.cpp
@@ -1,9 +1,11 @@
-#include "TestSuiteTest.h"
+#include "CoreSuite.h"
 #include "FailingTestCase.h"
+#include "TestSuiteTest.h"
 #include <cppunit/TestResult.h>
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSuiteTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSuiteTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 TestSuiteTest::TestSuiteTest()