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/TestTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'examples/cppunittest/TestTest.cpp') diff --git a/examples/cppunittest/TestTest.cpp b/examples/cppunittest/TestTest.cpp index c551a95..a98cc08 100644 --- a/examples/cppunittest/TestTest.cpp +++ b/examples/cppunittest/TestTest.cpp @@ -7,7 +7,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestTest, TestTest::TestTest() : - CppUnit::TestFixture() + CPPUNIT_NS::TestFixture() { } @@ -20,13 +20,13 @@ TestTest::~TestTest() void TestTest::setUp() { - m_suite = new CppUnit::TestSuite( "suite" ); + m_suite = new CPPUNIT_NS::TestSuite( "suite" ); m_test1 = new MockTestCase( "test1" ); m_test2 = new MockTestCase( "test2" ); m_suite->addTest( m_test1 ); m_suite->addTest( m_test2 ); - m_path = new CppUnit::TestPath(); + m_path = new CPPUNIT_NS::TestPath(); } @@ -122,11 +122,11 @@ TestTest::testFindTestThrow() void TestTest::testResolveTestPath() { - CppUnit::TestPath path1 = m_suite->resolveTestPath( "suite"); + CPPUNIT_NS::TestPath path1 = m_suite->resolveTestPath( "suite"); CPPUNIT_ASSERT_EQUAL( 1, path1.getTestCount() ); CPPUNIT_ASSERT( m_suite == path1.getTestAt(0) ); - CppUnit::TestPath path2 = m_suite->resolveTestPath( "suite/test2"); + CPPUNIT_NS::TestPath path2 = m_suite->resolveTestPath( "suite/test2"); CPPUNIT_ASSERT_EQUAL( 2, path2.getTestCount() ); CPPUNIT_ASSERT( m_suite == path2.getTestAt(0) ); CPPUNIT_ASSERT( m_test2 == path2.getTestAt(1) ); -- cgit v1.2.1