From 82d51cba4c7cc8d756ab14fdfc28181f007f3848 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Thu, 28 Mar 2002 14:50:09 +0000 Subject: Doc/cookbook. doc/cookbook.html: removed. Replaced by cookbook.doc. * doc/cookbook.dox: added, conversion of cookbook.html to Doxygen format. * doc/other_documentation.dox: added groups definition. * doc/Makefile.am: replaced cookbook.html by cookbook.dox * doc/Doxyfile.in: added predefined CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION. Replaced cookbook.html by cookbook.dox. * include/cppunitui/mfc/TestRunner.h: added, extracted from include/msvc6/testrunner/TestRunner.h. Moved class TestRunner to namespace CppUnit::MfcUi. * include/msvc6/testrunner/TestRunner.h: deprecated. A simple typedef to CppUnit::MfcUi::TestRunner. * include/textui/TestRuner.h: added, extracted from include/cppunit/TextTestRunner.h. * src/cppunit/TextTestRunner.cpp: renamed TestRunner.cpp. Moved into namespace CppUnit::TextUi. * src/msvc6/testruner/TestRunner.cpp: moved into namespace CppUnit::MfcUi. * src/cppunit/CompilerOutputter.cpp: removed printing "- " before NotEqualException addional message, for consistency between different TestRunner (Mfc,Text...) * include/cppunit/Asserter.h: * include/cppunit/CompilerOutputter.h: * include/cppunit/Exception.h: * include/cppunit/NotEqualException.h: * include/cppunit/Outputter.h: * include/cppunit/SourceLine.h: * include/cppunit/TestAssert.h: * include/cppunit/TestCaller.h: * include/cppunit/TestFailure.h: * include/cppunit/TestFixture.h: * include/cppunit/TestListener.h: * include/cppunit/TestResult.h: * include/cppunit/TestResultCollector.h: * include/cppunit/TestSucessListener.h: * include/cppunit/TestSuite.h: * include/cppunit/TextTestProgressListener.h: * include/cppunit/TextTestRunner.h: * include/cppunit/XmlOutputter.h: * include/cppunit/extensions/AutoRegisterSuite.h: * include/cppunit/extensions/HelperMacros.h: * include/cppunit/extensions/TestFactoryRegistry.h: * include/cppunit/extensions/TestSuiteBuilder.h: * include/cppunit/extensions/TestSuiteFactory.h: doc update. organization in groups. * examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp: * examples/msvc6/HostApp/HostApp.cpp: updated to use CppUnit::MfcUi::TestRunner. * examples/cppunittest/CppUnitTestMain.cpp: updated to use CppUnit::TextUi::TestRunner. --- src/cppunit/TextTestRunner.cpp | 174 ----------------------------------------- 1 file changed, 174 deletions(-) delete mode 100644 src/cppunit/TextTestRunner.cpp (limited to 'src/cppunit/TextTestRunner.cpp') diff --git a/src/cppunit/TextTestRunner.cpp b/src/cppunit/TextTestRunner.cpp deleted file mode 100644 index e17abe9..0000000 --- a/src/cppunit/TextTestRunner.cpp +++ /dev/null @@ -1,174 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include - -namespace CppUnit { - -/*! Constructs a new text runner. - * \param outputter used to print text result. Owned by the runner. - */ -TextTestRunner::TextTestRunner( Outputter *outputter ) - : m_outputter( outputter ) - , m_suite( new TestSuite( "All Tests" ) ) - , m_result( new TestResultCollector() ) - , m_eventManager( new TestResult() ) -{ - if ( !m_outputter ) - m_outputter = new TextOutputter( m_result, std::cout ); - m_eventManager->addListener( m_result ); -} - - -TextTestRunner::~TextTestRunner() -{ - delete m_eventManager; - delete m_outputter; - delete m_result; - delete m_suite; -} - - -/*! Adds the specified test. - * - * \param test Test to add. - */ -void -TextTestRunner::addTest( Test *test ) -{ - if ( test != NULL ) - m_suite->addTest( test ); -} - - -/*! Runs the named test case. - * - * \param testName Name of the test case to run. If an empty is given, then - * all added test are run. The name must be the name of - * of an added test. - * \param wait if \c true then the user must press the RETURN key - * before the run() method exit. - * \param printResult if \c true (default) then the test result are printed - * on the standard output. - * \param printProgress if \c true (default) then TextTestProgressListener is - * used to show the progress. - * \return \c true is the test was successful, \c false if the test - * failed or was not found. - */ -bool -TextTestRunner::run( std::string testName, - bool doWait, - bool doPrintResult, - bool printProgress ) -{ - runTestByName( testName, printProgress ); - printResult( doPrintResult ); - wait( doWait ); - return m_result->wasSuccessful(); -} - - -bool -TextTestRunner::runTestByName( std::string testName, - bool printProgress ) -{ - if ( testName.empty() ) - return runTest( m_suite, printProgress ); - - Test *test = findTestByName( testName ); - if ( test != NULL ) - return runTest( test, printProgress ); - - std::cout << "Test " << testName << " not found." << std::endl; - return false; -} - - -void -TextTestRunner::wait( bool doWait ) -{ - if ( doWait ) - { - std::cout << " to continue" << std::endl; - std::cin.get (); - } -} - - -void -TextTestRunner::printResult( bool doPrintResult ) -{ - std::cout << std::endl; - if ( doPrintResult ) - m_outputter->write(); -} - - -Test * -TextTestRunner::findTestByName( std::string name ) const -{ - for ( std::vector::const_iterator it = m_suite->getTests().begin(); - it != m_suite->getTests().end(); - ++it ) - { - Test *test = *it; - if ( test->getName() == name ) - return test; - } - return NULL; -} - - -bool -TextTestRunner::runTest( Test *test, - bool printTextProgress ) -{ - TextTestProgressListener progress; - if ( printTextProgress ) - m_eventManager->addListener( &progress ); - test->run( m_eventManager ); - if ( printTextProgress ) - m_eventManager->removeListener( &progress ); - return m_result->wasSuccessful(); -} - - -/*! Returns the result of the test run. - * Use this after calling run() to access the result of the test run. - */ -TestResultCollector & -TextTestRunner::result() const -{ - return *m_result; -} - - -/*! Returns the event manager. - * The instance of TestResult results returned is the one that is used to run the - * test. Use this to register additional TestListener before running the tests. - */ -TestResult & -TextTestRunner::eventManager() const -{ - return *m_eventManager; -} - - -/*! Specifies an alternate outputter. - * - * Notes that the outputter will be use after the test run only if \a printResult was - * \c true. - * \see CompilerOutputter, XmlOutputter, TextOutputter. - */ -void -TextTestRunner::setOutputter( Outputter *outputter ) -{ - delete m_outputter; - m_outputter = outputter; -} - - -} // namespace CppUnit -- cgit v1.2.1