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.
---
 examples/cppunittest/TestResultTest.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'examples/cppunittest/TestResultTest.cpp')

diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index b43b1b0..f1987ac 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -19,10 +19,10 @@ TestResultTest::~TestResultTest()
 void 
 TestResultTest::setUp()
 {
-  m_result = new CppUnit::TestResult();
+  m_result = new CPPUNIT_NS::TestResult();
   m_listener1 = new MockTestListener( "listener1" );
   m_listener2 = new MockTestListener( "listener2" );
-  m_dummyTest = new CppUnit::TestCase();
+  m_dummyTest = new CPPUNIT_NS::TestCase();
 }
 
 
@@ -54,8 +54,8 @@ TestResultTest::testStop()
 void 
 TestResultTest::testAddError()
 {
-  CppUnit::Exception *dummyException = new CppUnit::Exception( 
-                                           CppUnit::Message( "some_error" ) );
+  CPPUNIT_NS::Exception *dummyException = new CPPUNIT_NS::Exception( 
+                                           CPPUNIT_NS::Message( "some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException, true );
   m_result->addListener( m_listener1 );
 
@@ -68,8 +68,8 @@ TestResultTest::testAddError()
 void 
 TestResultTest::testAddFailure()
 {
-  CppUnit::Exception *dummyException = new CppUnit::Exception( 
-                                            CppUnit::Message("some_error" ) );
+  CPPUNIT_NS::Exception *dummyException = new CPPUNIT_NS::Exception( 
+                                            CPPUNIT_NS::Message("some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException, false );
   m_result->addListener( m_listener1 );
 
@@ -145,8 +145,8 @@ TestResultTest::testTwoListener()
 {
   m_listener1->setExpectStartTest( m_dummyTest );
   m_listener2->setExpectStartTest( m_dummyTest );
-  CppUnit::Exception *dummyException1 = new CppUnit::Exception( 
-                                             CppUnit::Message( "some_error" ) );
+  CPPUNIT_NS::Exception *dummyException1 = new CPPUNIT_NS::Exception( 
+                                             CPPUNIT_NS::Message( "some_error" ) );
   m_listener1->setExpectFailure( m_dummyTest, dummyException1, true );
   m_listener2->setExpectFailure( m_dummyTest, dummyException1, true );
   m_listener1->setExpectEndTest( m_dummyTest );
-- 
cgit v1.2.1