Include/cppunit/ui/text/TestRunner.

include/cppunit/ui/text/TestRunner.h:
* src/cppunit/TextTestRunner.cpp: Renamed TextUi::TestRunner
TextTestRunner and moved it to the CppUnit namespace. Added
a deprecated typedef for compatibility with previous version.

* include/cppunit/ui/text/TextTestRunner.h: added.

* include/cppunit/ui/mfc/TestRunner.h:
* src/cppunit/msvc6/testrunner/TestRunner.cpp: Renamed MfcUi::TestRunner
MfcTestRunner. Added deprecated typedef for compatibility. Renamed
TestRunner.cpp to MfcTestRunner.cpp.

* include/cppunit/ui/mfc/MfcTestRunner.h: added.

* include/cppunit/ui/qt/TestRunner.h:
* src/qttestrunner/TestRunner.cpp: renamed QtUi::TestRunner QtTestRunner
and moved it to CppUnit namespace. Added a deprecated typedef for
compatibility. Renamed TestRunner.cpp to QtTestRunner.cpp.

* include/cppunit/ui/qt/TestRunner.h:
* src/qttestrunner/TestRunner.h: Moved TestRunner to CppUnit namespace
and renamed it QtTestRunner. Added deprecated typedef for compatibility.

* include/cppunit/Asserter.h:
* src/cppunit/Asserter.cpp: changed namespace Asserter to a struct and
made all methods static.

* include/cppunit/extensions/HelperMacros.h:
* include/cppunit/extensions/SourceLine.h:
* include/cppunit/extensions/TestAssert.h:
* include/cppunit/extensions/TestPlugIn.h:
* include/cppunit/Portability.h: changed CPPUNIT_NS(symbol) to a
symbol macro that expand either to CppUnit or nothing. The symbol is
no longer a parameter.

* include/cppunit/portability/CppUnitVector.h:
* include/cppunit/portability/CppUnitDeque.h:
* include/cppunit/portability/CppUnitMap.h: added. STL Wrapper for
compilers that do not support template default argumenent and need
the allocator to be passed when instantiating STL container.

* examples/cppunittest/*.h:
* examples/cppunittest/*.cpp:
* src/msvc6/testrunner/*.h:
* src/msvc6/testrunner/*.cpp:
* src/msvc6/testpluginrunner/*.h:
* src/msvc6/testpluginrunner/*.cpp:
* src/qttestrunner/*.h:
* src/qttestrunner/*.cpp: replaced occurence of CppUnit:: by CPPUNIT_NS.

* src/cppunit/TestSuite.h:
replaced occurence of std::vector by CppUnitVector.

3 files changed, 99 insertions, 86 deletions

diff --git a/include/cppunit/ui/text/Makefile.am b/include/cppunit/ui/text/Makefile.am
index 59d5c3e..5f01d81 100644
--- a/include/cppunit/ui/text/Makefile.am
+++ b/include/cppunit/ui/text/Makefile.am
@@ -1,4 +1,5 @@
 libcppunitincludedir = $(includedir)/cppunit/ui/text
 
 libcppunitinclude_HEADERS = \
-	TestRunner.h
+	TestRunner.h \
+  TextTestRunner.h
diff --git a/include/cppunit/ui/text/TestRunner.h b/include/cppunit/ui/text/TestRunner.h
index 13bb8b0..c931f66 100644
--- a/include/cppunit/ui/text/TestRunner.h
+++ b/include/cppunit/ui/text/TestRunner.h
@@ -1,100 +1,18 @@
 #ifndef CPPUNIT_UI_TEXT_TESTRUNNER_H
 #define CPPUNIT_UI_TEXT_TESTRUNNER_H
 
-// Notes: this class is implemented in TextTestRunner.cpp.
-
-#include <cppunit/Portability.h>
-#include <string>
-#include <vector>
-#include <cppunit/TestRunner.h>
+#include <cppunit/ui/text/TextTestRunner.h>
 
 CPPUNIT_NS_BEGIN
 
 
-class Outputter;
-class Test;
-class TestSuite;
-class TextOutputter;
-class TestResult;
-class TestResultCollector;
-
-namespace TextUi
-{
-
 /*!
  * \brief A text mode test runner.
- * \ingroup WritingTestResult
  * \ingroup ExecutingTest
- *
- * The test runner manage the life cycle of the added tests.
- *
- * The test runner can run only one of the added tests or all the tests. 
- *
- * TestRunner prints out a trace as the tests are executed followed by a
- * summary at the end. The trace and summary print are optional.
- *
- * Here is an example of use:
- *
- * \code
- * CppUnit::TextUi::TestRunner runner;
- * runner.addTest( ExampleTestCase::suite() );
- * runner.run( "", true );    // Run all tests and wait
- * \endcode
- *
- * The trace is printed using a TextTestProgressListener. The summary is printed
- * using a TextOutputter. 
- *
- * You can specify an alternate Outputter at construction
- * or later with setOutputter(). 
- *
- * After construction, you can register additional TestListener to eventManager(),
- * for a custom progress trace, for example.
- *
- * \code
- * CppUnit::TextUi::TestRunner runner;
- * runner.addTest( ExampleTestCase::suite() );
- * runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter( 
- *                          &runner.result(),
- *                          std::cerr ) );
- * MyCustomProgressTestListener progress;
- * runner.eventManager().addListener( &progress );
- * runner.run( "", true );    // Run all tests and wait
- * \endcode
- *
- * \see CompilerOutputter, XmlOutputter, TextOutputter.
+ * \deprecated Use CppUnit::TextUi::TestRunner instead.
  */
-class CPPUNIT_API TestRunner : public CPPUNIT_NS(TestRunner)
-{
-public:
-  // Work around VC++ bug (class has same name as parent)
-  typedef CPPUNIT_NS(TestRunner) SuperClass;
-
-  TestRunner( Outputter *outputter =NULL );
-
-  virtual ~TestRunner();
-
-  bool run( std::string testPath ="",
-            bool doWait = false,
-            bool doPrintResult = true,
-            bool doPrintProgress = true );
-
-  void setOutputter( Outputter *outputter );
-
-  TestResultCollector &result() const;
-
-  TestResult &eventManager() const;
-
-protected:
-  virtual void wait( bool doWait );
-  virtual void printResult( bool doPrintResult );
-
-  TestResultCollector *m_result;
-  TestResult *m_eventManager;
-  Outputter *m_outputter;
-};
-
+typedef CPPUNIT_NS::TextUi::TestRunner TextTestRunner;
 
-} // namespace TextUi
 
 CPPUNIT_NS_END
 
diff --git a/include/cppunit/ui/text/TextTestRunner.h b/include/cppunit/ui/text/TextTestRunner.h
new file mode 100644
index 0000000..dee37a7
--- /dev/null
+++ b/include/cppunit/ui/text/TextTestRunner.h
@@ -0,0 +1,94 @@
+#ifndef CPPUNIT_TEXTTESTRUNNER_H
+#define CPPUNIT_TEXTTESTRUNNER_H
+
+
+#include <cppunit/Portability.h>
+#include <string>
+#include <vector>
+#include <cppunit/TestRunner.h>
+
+CPPUNIT_NS_BEGIN
+
+
+class Outputter;
+class Test;
+class TestSuite;
+class TextOutputter;
+class TestResult;
+class TestResultCollector;
+
+
+
+/*!
+ * \brief A text mode test runner.
+ * \ingroup WritingTestResult
+ * \ingroup ExecutingTest
+ *
+ * The test runner manage the life cycle of the added tests.
+ *
+ * The test runner can run only one of the added tests or all the tests. 
+ *
+ * TestRunner prints out a trace as the tests are executed followed by a
+ * summary at the end. The trace and summary print are optional.
+ *
+ * Here is an example of use:
+ *
+ * \code
+ * CppUnit::TextTestRunner runner;
+ * runner.addTest( ExampleTestCase::suite() );
+ * runner.run( "", true );    // Run all tests and wait
+ * \endcode
+ *
+ * The trace is printed using a TextTestProgressListener. The summary is printed
+ * using a TextOutputter. 
+ *
+ * You can specify an alternate Outputter at construction
+ * or later with setOutputter(). 
+ *
+ * After construction, you can register additional TestListener to eventManager(),
+ * for a custom progress trace, for example.
+ *
+ * \code
+ * CppUnit::TextTestRunner runner;
+ * runner.addTest( ExampleTestCase::suite() );
+ * runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter( 
+ *                          &runner.result(),
+ *                          std::cerr ) );
+ * MyCustomProgressTestListener progress;
+ * runner.eventManager().addListener( &progress );
+ * runner.run( "", true );    // Run all tests and wait
+ * \endcode
+ *
+ * \see CompilerOutputter, XmlOutputter, TextOutputter.
+ */
+class CPPUNIT_API TextTestRunner : public CPPUNIT_NS::TestRunner
+{
+public:
+  TextTestRunner( Outputter *outputter =NULL );
+
+  virtual ~TextTestRunner();
+
+  bool run( std::string testPath ="",
+            bool doWait = false,
+            bool doPrintResult = true,
+            bool doPrintProgress = true );
+
+  void setOutputter( Outputter *outputter );
+
+  TestResultCollector &result() const;
+
+  TestResult &eventManager() const;
+
+protected:
+  virtual void wait( bool doWait );
+  virtual void printResult( bool doPrintResult );
+
+  TestResultCollector *m_result;
+  TestResult *m_eventManager;
+  Outputter *m_outputter;
+};
+
+
+CPPUNIT_NS_END
+
+#endif  // CPPUNIT_TEXTTESTRUNNER_H