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, 13 insertions, 13 deletions

diff --git a/examples/cppunittest/TestSuiteTest.cpp b/examples/cppunittest/TestSuiteTest.cpp
index d63dc45..ae6e65a 100644
--- a/examples/cppunittest/TestSuiteTest.cpp
+++ b/examples/cppunittest/TestSuiteTest.cpp
@@ -21,7 +21,7 @@ TestSuiteTest::~TestSuiteTest()
 void 
 TestSuiteTest::setUp()
 {
-  m_suite = new CppUnit::TestSuite();
+  m_suite = new CPPUNIT_NS::TestSuite();
 }
 
 
@@ -36,7 +36,7 @@ void
 TestSuiteTest::testConstructor()
 {
   std::string name( "MySuite" );
-  CppUnit::TestSuite suite( name );
+  CPPUNIT_NS::TestSuite suite( name );
   CPPUNIT_ASSERT_EQUAL( name, suite.getName() );
 }
 
@@ -73,7 +73,7 @@ TestSuiteTest::testCountTestCasesWithSubSuite()
   case2->setExpectedCountTestCasesCall();
   MockTestCase *case3 = new MockTestCase( "test3" );
   case3->setExpectedCountTestCasesCall();
-  CppUnit::TestSuite *subSuite = new CppUnit::TestSuite( "SubSuite");
+  CPPUNIT_NS::TestSuite *subSuite = new CPPUNIT_NS::TestSuite( "SubSuite");
   subSuite->addTest( case1 );
   subSuite->addTest( case2 );
   m_suite->addTest( case3 );
@@ -93,7 +93,7 @@ TestSuiteTest::testRunWithOneTest()
   case1->setExpectedRunTestCall();
   m_suite->addTest( case1 );
 
-  CppUnit::TestResult result;
+  CPPUNIT_NS::TestResult result;
   m_suite->run( &result );
 
   case1->verify();
@@ -109,13 +109,13 @@ TestSuiteTest::testRunWithOneTestAndSubSuite()
   case2->setExpectedRunTestCall();
   MockTestCase *case3 = new MockTestCase( "test3" );
   case3->setExpectedRunTestCall();
-  CppUnit::TestSuite *subSuite = new CppUnit::TestSuite( "SubSuite");
+  CPPUNIT_NS::TestSuite *subSuite = new CPPUNIT_NS::TestSuite( "SubSuite");
   subSuite->addTest( case1 );
   subSuite->addTest( case2 );
   m_suite->addTest( case3 );
   m_suite->addTest( subSuite);
 
-  CppUnit::TestResult result;
+  CPPUNIT_NS::TestResult result;
   m_suite->run( &result );
 
   case1->verify();
@@ -127,8 +127,8 @@ TestSuiteTest::testRunWithOneTestAndSubSuite()
 void 
 TestSuiteTest::testGetTests()
 {
-  m_suite->addTest( new CppUnit::TestCase( "test1" ) );
-  m_suite->addTest( new CppUnit::TestCase( "test2" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test1" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) );
   CPPUNIT_ASSERT_EQUAL( 2, int(m_suite->getTests().size()) );
 }
 
@@ -136,7 +136,7 @@ TestSuiteTest::testGetTests()
 void 
 TestSuiteTest::testDeleteContents()
 {
-  m_suite->addTest( new CppUnit::TestCase( "test2" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) );
   m_suite->deleteContents();
   CPPUNIT_ASSERT_EQUAL( 0, int(m_suite->getTests().size()) );
 }
@@ -145,8 +145,8 @@ TestSuiteTest::testDeleteContents()
 void 
 TestSuiteTest::testGetChildTestCount()
 {
-  m_suite->addTest( new CppUnit::TestCase( "test1" ) );
-  m_suite->addTest( new CppUnit::TestCase( "test2" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test1" ) );
+  m_suite->addTest( new CPPUNIT_NS::TestCase( "test2" ) );
 
   CPPUNIT_ASSERT_EQUAL( 2, m_suite->getChildTestCount() );
 }
@@ -155,8 +155,8 @@ TestSuiteTest::testGetChildTestCount()
 void 
 TestSuiteTest::testGetChildTestAt()
 {
-  CppUnit::TestCase *test1 = new CppUnit::TestCase( "test1" );
-  CppUnit::TestCase *test2 = new CppUnit::TestCase( "test2" );
+  CPPUNIT_NS::TestCase *test1 = new CPPUNIT_NS::TestCase( "test1" );
+  CPPUNIT_NS::TestCase *test2 = new CPPUNIT_NS::TestCase( "test2" );
   m_suite->addTest( test1 );
   m_suite->addTest( test2 );