From f1bf3276752a10a2cdf4e3cf3087399d199c4566 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur 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/TestFailureTest.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/cppunittest/TestFailureTest.cpp') diff --git a/examples/cppunittest/TestFailureTest.cpp b/examples/cppunittest/TestFailureTest.cpp index d48f286..6c76820 100644 --- a/examples/cppunittest/TestFailureTest.cpp +++ b/examples/cppunittest/TestFailureTest.cpp @@ -34,8 +34,8 @@ TestFailureTest::tearDown() void TestFailureTest::testConstructorAndGetters() { - CppUnit::TestCase test; - CppUnit::Exception *error = new ObservedException( this ); + CPPUNIT_NS::TestCase test; + CPPUNIT_NS::Exception *error = new ObservedException( this ); checkTestFailure( &test, error, false ); CPPUNIT_ASSERT( m_exceptionDestroyed ); } @@ -44,8 +44,8 @@ TestFailureTest::testConstructorAndGetters() void TestFailureTest::testConstructorAndGettersForError() { - CppUnit::TestCase test; - CppUnit::Exception *error = new ObservedException( this ); + CPPUNIT_NS::TestCase test; + CPPUNIT_NS::Exception *error = new ObservedException( this ); checkTestFailure( &test, error, true ); CPPUNIT_ASSERT( m_exceptionDestroyed ); } @@ -59,11 +59,11 @@ TestFailureTest::exceptionDestroyed() void -TestFailureTest::checkTestFailure( CppUnit::Test *test, - CppUnit::Exception *error, +TestFailureTest::checkTestFailure( CPPUNIT_NS::Test *test, + CPPUNIT_NS::Exception *error, bool isError ) { - CppUnit::TestFailure failure( test, error, isError ); + CPPUNIT_NS::TestFailure failure( test, error, isError ); CPPUNIT_ASSERT_EQUAL( test, failure.failedTest() ); CPPUNIT_ASSERT_EQUAL( error, failure.thrownException() ); CPPUNIT_ASSERT_EQUAL( isError, failure.isError() ); -- cgit v1.2.1