From 150339335e3c5538c1e496ae01babf148bd29ec5 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Sun, 7 Oct 2001 18:37:53 +0000 Subject: Include/cppunit/CompilerTestResultOutputter. include/cppunit/CompilerTestResultOutputter.h : renamed CompilerOutputter.h * src/cppunit/CompilerTestResultOutputter.cpp : renamed CompilerOutputter.cpp * include/cppunit/CompilerTestResultOutputter.h : * src/cppunit/CompilerTestResultOutputter.cpp : ajust max line length for wrapping. Added static factory method defaultOutputter(). Print the number of test runs on success. * include/cppunit/CompilerTestResultOutputter.h : renamed CompilerOutputter.h. * src/cppunit/CompilerTestResultOutputter.cpp : renamed CompilerOutputter.cpp. * examples/cppunittest/CppUnitTestMain.cpp : use factory method CompilerTestResultOutputter::defaultOutputter(). * src/msvc6/DSPlugIn/DSPlugIn.dsp : removed COM registration in post-build step. IT is automatically done by VC++ when the add-in is added. Caused build to failed if the add-in was used in VC++. * NEWS : updated. * src/cppunit/TestAssert.cpp : modified deprecated assert implementations to use Asserter. * examples/cppunittest/XmlTestResultOutputterTest.h : renamed XmlOutputterTest.h. * examples/cppunittest/XmlTestResultOutputterTest.cpp : renamed XmlOutputterTest.cpp. * NEWS : * examples/cppunittest/CppUnitTestMain.cpp : * examples/cppunittest/CppUnitTestMain.dsp : * examples/cppunittest/Makefile.am : * examples/cppunittest/XmlTestResultOutputterTest.h : * examples/cppunittest/XmlTestResultOutputterTest.cpp : * examples/msvc6/CppUniTestApp/CppUnitTestApp.dsp * include/cppunit/CompilerOutputter.h : * include/cppunit/Makefile.am : * include/cppunit/XmlTestResultOutputter.h : * src/cppunit/CompilerOutputter.cpp : * src/cppunit/cppunit.dsp : * src/cppunit/Makefile.am : * src/cppunit/XmlTestResultOutputter.cpp : change due to renaming CompilerTestResultOutputter to CompilerOutputter, XmlTestResultOutputter to XmlOuputter, XmlTestResultOutputterTest to XmlOutputterTest. --- src/cppunit/CompilerTestResultOutputter.cpp | 186 ---------------------------- 1 file changed, 186 deletions(-) delete mode 100644 src/cppunit/CompilerTestResultOutputter.cpp (limited to 'src/cppunit/CompilerTestResultOutputter.cpp') diff --git a/src/cppunit/CompilerTestResultOutputter.cpp b/src/cppunit/CompilerTestResultOutputter.cpp deleted file mode 100644 index 1c75b49..0000000 --- a/src/cppunit/CompilerTestResultOutputter.cpp +++ /dev/null @@ -1,186 +0,0 @@ -#include -#include -#include -#include - - -namespace CppUnit -{ - -/** Print TestResult in a compiler compatible format. - * - * Heres is an example of usage: - * \code - * int main( int argc, char* argv[] ) { - * bool selfTest = (argc > 1) && - * (std::string("-selftest") == argv[1]); - * - * CppUnit::TextTestRunner runner; - * runner.addTest( CppUnitTest::suite() ); - * - * bool wasSucessful = runner.run( "", false, !selfTest ); - * if ( selfTest ) - * { - * CppUnit::CompilerTestResultOutputter outputter( runner.result(), - * std::cerr ); - * outputter.write(); - * } - * - * return wasSucessful ? 0 : 1; - * } - * \endcode - */ -CompilerTestResultOutputter::CompilerTestResultOutputter( - TestResult *result, - std::ostream &stream ) : - m_result( result ), - m_stream( stream ) -{ -} - - -CompilerTestResultOutputter::~CompilerTestResultOutputter() -{ -} - - -void -CompilerTestResultOutputter::write() -{ - if ( m_result->wasSuccessful() ) - printSucess(); - else - printFailureReport(); -} - - -void -CompilerTestResultOutputter::printSucess() -{ - m_stream << "OK" << std::endl; -} - - -void -CompilerTestResultOutputter::printFailureReport() -{ - printFailuresList(); - printStatistics(); -} - - -void -CompilerTestResultOutputter::printFailuresList() -{ - for ( int index =0; index < m_result->testFailuresTotal(); ++index) - { - printFailureDetail( m_result->failures()[ index ] ); - } -} - - -void -CompilerTestResultOutputter::printFailureDetail( TestFailure *failure ) -{ - printFailureLocation( failure->sourceLine() ); - printFailureType( failure ); - printFailedTestName( failure ); - printFailureMessage( failure ); -} - - -void -CompilerTestResultOutputter::printFailureLocation( SourceLine sourceLine ) -{ - if ( sourceLine.isValid() ) - m_stream << sourceLine.fileName() - << "(" << sourceLine.lineNumber() << ") : "; - else - m_stream << "##Failure Location unknown## : "; -} - - -void -CompilerTestResultOutputter::printFailureType( TestFailure *failure ) -{ - m_stream << (failure->isError() ? "Error" : "Assertion"); -} - - -void -CompilerTestResultOutputter::printFailedTestName( TestFailure *failure ) -{ - m_stream << std::endl; - m_stream << "Test name: " << failure->failedTestName(); -} - - -void -CompilerTestResultOutputter::printFailureMessage( TestFailure *failure ) -{ - m_stream << std::endl; - Exception *thrownException = failure->thrownException(); - if ( thrownException->isInstanceOf( NotEqualException::type() ) ) - printNotEqualMessage( thrownException ); - else - printDefaultMessage( thrownException ); - m_stream << std::endl; -} - - -void -CompilerTestResultOutputter::printNotEqualMessage( Exception *thrownException ) -{ - NotEqualException *e = (NotEqualException *)thrownException; - m_stream << wrap( "- Expected : " + e->expectedValue() ); - m_stream << std::endl; - m_stream << wrap( "- Actual : " + e->actualValue() ); - m_stream << std::endl; - if ( !e->additionalMessage().empty() ) - { - m_stream << wrap( "- " + e->additionalMessage() ); - m_stream << std::endl; - } -} - - -void -CompilerTestResultOutputter::printDefaultMessage( Exception *thrownException ) -{ - std::string wrappedMessage = wrap( thrownException->what() ); - m_stream << wrappedMessage << std::endl; -} - - -void -CompilerTestResultOutputter::printStatistics() -{ - m_stream << "Failures !!!" << std::endl; - m_stream << "Run: " << m_result->runTests() << " " - << "Failure total: " << m_result->testFailuresTotal() << " " - << "Failures: " << m_result->testFailures() << " " - << "Errors: " << m_result->testErrors() - << std::endl; -} - - -std::string -CompilerTestResultOutputter::wrap( std::string message ) -{ - const int maxLineLength = 60; - std::string wrapped; - int index =0; - while ( index < message.length() ) - { - std::string line( message.substr( index, maxLineLength ) ); - wrapped += line; - index += maxLineLength; - if ( index < message.length() ) - wrapped += "\n"; - } - return wrapped; -} - - - -} // namespace CppUnit -- cgit v1.2.1