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.

1 files changed, 23 insertions, 23 deletions

diff --git a/examples/cppunittest/TestResultCollectorTest.cpp b/examples/cppunittest/TestResultCollectorTest.cpp
index bb60dd6..0d8fdd6 100644
--- a/examples/cppunittest/TestResultCollectorTest.cpp
+++ b/examples/cppunittest/TestResultCollectorTest.cpp
@@ -22,10 +22,10 @@ TestResultCollectorTest::setUp()
 {
   m_lockCount = 0;
   m_unlockCount = 0;
-  m_result = new CppUnit::TestResultCollector();
+  m_result = new CPPUNIT_NS::TestResultCollector();
   m_synchronizedResult = new SynchronizedTestResult( this );  
-  m_test = new CppUnit::TestCase();
-  m_test2 = new CppUnit::TestCase();
+  m_test = new CPPUNIT_NS::TestCase();
+  m_test2 = new CPPUNIT_NS::TestCase();
 }
 
 
@@ -49,16 +49,16 @@ TestResultCollectorTest::testConstructor()
 void 
 TestResultCollectorTest::testAddTwoErrors()
 {
-  CppUnit::Message errorMessage1( "First Error" );
-  CppUnit::Message errorMessage2( "Second Error" );
+  CPPUNIT_NS::Message errorMessage1( "First Error" );
+  CPPUNIT_NS::Message errorMessage2( "Second Error" );
   {
-    CppUnit::TestFailure failure1( m_test, 
-                                   new CppUnit::Exception( errorMessage1 ),
+    CPPUNIT_NS::TestFailure failure1( m_test, 
+                                   new CPPUNIT_NS::Exception( errorMessage1 ),
                                    true );
     m_result->addFailure( failure1 );
 
-    CppUnit::TestFailure failure2( m_test2, 
-                                   new CppUnit::Exception( errorMessage2 ),
+    CPPUNIT_NS::TestFailure failure2( m_test2, 
+                                   new CPPUNIT_NS::Exception( errorMessage2 ),
                                    true );
     m_result->addFailure( failure2 );
   } // ensure that the test result duplicate the failures.
@@ -78,16 +78,16 @@ TestResultCollectorTest::testAddTwoErrors()
 void 
 TestResultCollectorTest::testAddTwoFailures()
 {
-  CppUnit::Message errorMessage1( "First Failure" );
-  CppUnit::Message errorMessage2( "Second Failure" );
+  CPPUNIT_NS::Message errorMessage1( "First Failure" );
+  CPPUNIT_NS::Message errorMessage2( "Second Failure" );
   {
-    CppUnit::TestFailure failure1( m_test, 
-                                   new CppUnit::Exception( errorMessage1 ),
+    CPPUNIT_NS::TestFailure failure1( m_test, 
+                                   new CPPUNIT_NS::Exception( errorMessage1 ),
                                    false );
     m_result->addFailure( failure1 );
 
-    CppUnit::TestFailure failure2( m_test2, 
-                                   new CppUnit::Exception( errorMessage2 ),
+    CPPUNIT_NS::TestFailure failure2( m_test2, 
+                                   new CPPUNIT_NS::Exception( errorMessage2 ),
                                    false );
     m_result->addFailure( failure2 );
   } // ensure that the test result duplicate the failures.
@@ -227,12 +227,12 @@ TestResultCollectorTest::checkResult( int failures,
 
 
 void
-TestResultCollectorTest::checkFailure( CppUnit::TestFailure *failure,
-                                       CppUnit::Message expectedMessage,
-                                       CppUnit::Test *expectedTest,
+TestResultCollectorTest::checkFailure( CPPUNIT_NS::TestFailure *failure,
+                                       CPPUNIT_NS::Message expectedMessage,
+                                       CPPUNIT_NS::Test *expectedTest,
                                        bool expectedIsError )
 {
-  CppUnit::Message actualMessage( failure->thrownException()->message() );
+  CPPUNIT_NS::Message actualMessage( failure->thrownException()->message() );
   CPPUNIT_ASSERT( expectedMessage == actualMessage );
   CPPUNIT_ASSERT_EQUAL( expectedTest, failure->failedTest() );
   CPPUNIT_ASSERT_EQUAL( expectedIsError, failure->isError() );
@@ -286,12 +286,12 @@ TestResultCollectorTest::addError( std::string message )
 
 void 
 TestResultCollectorTest::addFailure( std::string message, 
-                                     CppUnit::Test *failedTest, 
+                                     CPPUNIT_NS::Test *failedTest, 
                                      bool isError,
-                                     CppUnit::TestResultCollector *result )
+                                     CPPUNIT_NS::TestResultCollector *result )
 {
-  CppUnit::TestFailure failure( failedTest, 
-                                new CppUnit::Exception( CppUnit::Message( message ) ), 
+  CPPUNIT_NS::TestFailure failure( failedTest, 
+                                new CPPUNIT_NS::Exception( CPPUNIT_NS::Message( message ) ), 
                                 isError );
   result->addFailure( failure );
 }