3 files changed, 86 insertions, 72 deletions
diff --git a/include/cppunit/ui/mfc/Makefile.am b/include/cppunit/ui/mfc/Makefile.am
index 5d84e7b..1ea8b5e 100644
--- a/include/cppunit/ui/mfc/Makefile.am
+++ b/include/cppunit/ui/mfc/Makefile.am
@@ -1,4 +1,5 @@
 libcppunitincludedir = $(includedir)/cppunit/ui/mfc
 
 libcppunitinclude_HEADERS = \
-	TestRunner.h
+	TestRunner.h \
+  MfcTestRunner.h
diff --git a/include/cppunit/ui/mfc/MfcTestRunner.h b/include/cppunit/ui/mfc/MfcTestRunner.h
new file mode 100644
index 0000000..6a5f7b7
--- /dev/null
+++ b/include/cppunit/ui/mfc/MfcTestRunner.h
@@ -0,0 +1,76 @@
+#ifndef CPPUNITUI_MFC_MFCTESTRUNNER_H
+#define CPPUNITUI_MFC_MFCTESTRUNNER_H
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+#include <cppunit/Portability.h>
+#include <cppunit/portability/CppUnitVector.h>
+
+/* Refer to MSDN documentation to know how to write and use MFC extension DLL:
+   mk:@MSITStore:h:\DevStudio\MSDN\98VSa\1036\vcmfc.chm::/html/_mfcnotes_tn033.htm#_mfcnotes_how_to_write_an_mfc_extension_dll
+   
+   This can be found in the index with "mfc extension"
+   The basic:
+   Using:
+   - your application must use MFC DLL
+   - memory allocation is done using the same heap
+   - you must define the symbol _AFX_DLL
+
+   Building:
+   - you must define the symbol _AFX_DLL and _AFX_EXT
+   - export class using AFX_EXT_CLASS
+ */
+
+CPPUNIT_NS_BEGIN
+
+  class Test;
+  class TestSuite;
+
+
+/*! \brief MFC test runner.
+ * \ingroup ExecutingTest
+ *
+ * Use this to launch the MFC TestRunner. Usually called from you CWinApp subclass:
+ *
+ * \code
+ * #include <cppunit/ui/mfc/MfcTestRunner.h>
+ * #include <cppunit/extensions/TestFactoryRegistry.h>
+ *
+ * void 
+ * CHostAppApp::RunUnitTests()
+ * {
+ *   CppUnit::MfcTestRunner runner;
+ *   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
+ *
+ *   runner.run();    
+ * }
+ * \endcode
+ * \see CppUnit::TextTestRunner, CppUnit::TestFactoryRegistry.
+ */
+class AFX_EXT_CLASS MfcTestRunner
+{
+public:
+  MfcTestRunner();
+  virtual ~MfcTestRunner();
+
+  void run();
+
+  void addTest( Test *test );
+
+  void addTests( const CppUnitVector<Test *> &tests );
+
+protected:
+  Test *getRootTest();
+
+  TestSuite *m_suite;
+
+  typedef CppUnitVector<Test *> Tests;
+  Tests m_tests;
+};
+
+
+CPPUNIT_NS_END
+
+#endif // CPPUNITUI_MFC_MFCTESTRUNNER_H
+\ No newline at end of file
diff --git a/include/cppunit/ui/mfc/TestRunner.h b/include/cppunit/ui/mfc/TestRunner.h
index 7186bf6..c4d6aff 100644
--- a/include/cppunit/ui/mfc/TestRunner.h
+++ b/include/cppunit/ui/mfc/TestRunner.h
@@ -1,82 +1,19 @@
 #ifndef CPPUNITUI_MFC_TESTRUNNER_H
 #define CPPUNITUI_MFC_TESTRUNNER_H
 
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include <cppunit/Portability.h>
-#include <vector>
-
-/* Refer to MSDN documentation to know how to write and use MFC extension DLL:
-   mk:@MSITStore:h:\DevStudio\MSDN\98VSa\1036\vcmfc.chm::/html/_mfcnotes_tn033.htm#_mfcnotes_how_to_write_an_mfc_extension_dll
-   
-   This can be found in the index with "mfc extension"
-   The basic:
-   Using:
-   - your application must use MFC DLL
-   - memory allocation is done using the same heap
-   - you must define the symbol _AFX_DLL
-
-   Building:
-   - you must define the symbol _AFX_DLL and _AFX_EXT
-   - export class using AFX_EXT_CLASS
- */
+#include <cppunit/ui/mfc/MfcTestRunner.h>
 
 CPPUNIT_NS_BEGIN
 
-  class Test;
-  class TestSuite;
-
+#if defined(CPPUNIT_HAVE_NAMESPACES)
 namespace MfcUi
 {
-
-
-/*! \brief MFC test runner.
- * \ingroup ExecutingTest
- *
- * Use this to launch the MFC TestRunner. Usually called from you CWinApp subclass:
- *
- * \code
- * #include <cppunit/ui/mfc/TestRunner.h>
- * #include <cppunit/extensions/TestFactoryRegistry.h>
- *
- * void 
- * CHostAppApp::RunUnitTests()
- * {
- *   CppUnit::MfcUi::TestRunner runner;
- *   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
- *
- *   runner.run();    
- * }
- * \endcode
- * \see CppUnit::TextUi::TestRunner, CppUnit::TestFactoryRegistry.
- */
-class AFX_EXT_CLASS TestRunner 
-{
-public:
-  TestRunner();
-  virtual ~TestRunner();
-
-  void run();
-
-  void addTest( Test *test );
-
-  void addTests( const std::vector<Test *> &tests );
-
-protected:
-  Test *getRootTest();
-
-  TestSuite *m_suite;
-
-  typedef std::vector<Test *> Tests;
-  Tests m_tests;
-};
-
-
-} // namespace MfcUi
-
+  /*! Mfc TestRunner (DEPRECATED).
+   * \deprecated Use CppUnit::MfcTestRunner instead.
+   */
+  typedef CPPUNIT_NS::MfcTestRunner TestRunner;
+}
+#endif // defined(CPPUNIT_HAVE_NAMESPACES)
 
 CPPUNIT_NS_END