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/TestCaseTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/cppunittest/TestCaseTest.cpp') diff --git a/examples/cppunittest/TestCaseTest.cpp b/examples/cppunittest/TestCaseTest.cpp index 91a3f22..3a948d4 100644 --- a/examples/cppunittest/TestCaseTest.cpp +++ b/examples/cppunittest/TestCaseTest.cpp @@ -27,7 +27,7 @@ void TestCaseTest::setUp() { m_testListener = new MockTestListener( "mock-testlistener" ); - m_result = new CppUnit::TestResult(); + m_result = new CPPUNIT_NS::TestResult(); m_result->addListener( m_testListener ); } @@ -107,7 +107,7 @@ TestCaseTest::checkFailure( bool failSetUp, void TestCaseTest::testCountTestCases() { - CppUnit::TestCase test; + CPPUNIT_NS::TestCase test; CPPUNIT_ASSERT_EQUAL( 1, test.countTestCases() ); } @@ -115,7 +115,7 @@ TestCaseTest::testCountTestCases() void TestCaseTest::testDefaultConstructor() { - CppUnit::TestCase test; + CPPUNIT_NS::TestCase test; CPPUNIT_ASSERT_EQUAL( std::string(""), test.getName() ); } @@ -124,7 +124,7 @@ void TestCaseTest::testConstructorWithName() { std::string testName( "TestName" ); - CppUnit::TestCase test( testName ); + CPPUNIT_NS::TestCase test( testName ); CPPUNIT_ASSERT_EQUAL( testName, test.getName() ); } @@ -148,7 +148,7 @@ TestCaseTest::testTwoRun() void TestCaseTest::testGetChildTestCount() { - CppUnit::TestCase test( "test" ); + CPPUNIT_NS::TestCase test( "test" ); CPPUNIT_ASSERT_EQUAL( 0, test.getChildTestCount() ); } @@ -156,6 +156,6 @@ TestCaseTest::testGetChildTestCount() void TestCaseTest::testGetChildTestAtThrow() { - CppUnit::TestCase test( "test" ); + CPPUNIT_NS::TestCase test( "test" ); test.getChildTestAt( 0 ); } -- cgit v1.2.1