From f1bf3276752a10a2cdf4e3cf3087399d199c4566 Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Sat, 13 Jul 2002 09:33:50 +0000
Subject: 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.
---
 src/qttestrunner/TestRunnerModel.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/qttestrunner/TestRunnerModel.cpp')

diff --git a/src/qttestrunner/TestRunnerModel.cpp b/src/qttestrunner/TestRunnerModel.cpp
index ed32302..7058101 100644
--- a/src/qttestrunner/TestRunnerModel.cpp
+++ b/src/qttestrunner/TestRunnerModel.cpp
@@ -12,7 +12,7 @@
 #include "TestRunnerThreadFinishedEvent.h"
 
 
-TestRunnerModel::TestRunnerModel( CppUnit::Test *rootTest ) :
+TestRunnerModel::TestRunnerModel( CPPUNIT_NS::Test *rootTest ) :
     _rootTest( rootTest ),
     _runnerThread( NULL ),
     _result( NULL )
@@ -26,7 +26,7 @@ TestRunnerModel::~TestRunnerModel()
 }
 
 
-CppUnit::Test *
+CPPUNIT_NS::Test *
 TestRunnerModel::rootTest()
 {
   return _rootTest;
@@ -34,7 +34,7 @@ TestRunnerModel::rootTest()
 
 
 void 
-TestRunnerModel::resetTestReportCounterFor( CppUnit::Test *testToRun )
+TestRunnerModel::resetTestReportCounterFor( CPPUNIT_NS::Test *testToRun )
 {
   if ( isTestRunning() )
     return;
@@ -87,7 +87,7 @@ TestRunnerModel::failureAt( int index )
 
 
 void 
-TestRunnerModel::runTest( CppUnit::Test *testToRun )
+TestRunnerModel::runTest( CPPUNIT_NS::Test *testToRun )
 {
   if ( isTestRunning() )
     return;
@@ -97,7 +97,7 @@ TestRunnerModel::runTest( CppUnit::Test *testToRun )
   {
     LockGuard guard( _lock );
     delete _result;
-    _result = new CppUnit::TestResult();
+    _result = new CPPUNIT_NS::TestResult();
     _result->addListener( this );
   }
 
@@ -137,14 +137,14 @@ TestRunnerModel::stopRunningTest()
 
 // Called from the TestRunnerThread.
 void 
-TestRunnerModel::startTest( CppUnit::Test *test )
+TestRunnerModel::startTest( CPPUNIT_NS::Test *test )
 {
 }
 
 
 // Called from the TestRunnerThread.
 void 
-TestRunnerModel::addFailure( const CppUnit::TestFailure &failure )
+TestRunnerModel::addFailure( const CPPUNIT_NS::TestFailure &failure )
 {
   addFailureInfo( new TestFailureInfo( failure.failedTest(), 
                                        failure.thrownException(),
@@ -154,7 +154,7 @@ TestRunnerModel::addFailure( const CppUnit::TestFailure &failure )
 
 // Called from the TestRunnerThread.
 void 
-TestRunnerModel::endTest( CppUnit::Test *test )
+TestRunnerModel::endTest( CPPUNIT_NS::Test *test )
 {
   int numberOfTestCaseRun;
   {
-- 
cgit v1.2.1