From c2ac2ac3bcfb30cb8ae4e95e531f1b630b8dd80e Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Wed, 3 Oct 2001 20:16:12 +0000 Subject: Include/cppunit/TestFailure. include/cppunit/TestFailure.cpp : * include/cppunit/TestFailure.h : fixed some constness issues. Added argument to indicate the type of failure to constructor. Added isError(). * include/cppunit/TestListener.h : removed addError(). addFailure() now take a TestFailure as argument. * include/cppunit/TestResult.h : * include/cppunit/TestResult.cpp : removed errors(). Refactored. Fixed some constness issues. Added typedef TestFailures for vector returned by failures(). failures() returns a const reference on the list of failure. added testFailuresTotal(). Constructor can take an optional synchronization object. * include/cppunit/TextTestResult.h : * include/cppunit/TextTestResult.cpp : removed printErrors(). Refactored. Updated to suit new TestResult, errors and failures are reported in the same list. * examples/cppunittest/TestFailureTest.cpp : * examples/cppunittest/TestFailureTest.h : modified to use the new TestFailure constructor. Added one test. * examples/cppunittest/TestListenerTest.cpp: removed addError(). Refactored to suit new TestListener. * examples/cppunittest/TestResultTest.h : * examples/cppunittest/TestResultTest.cpp : modified to suit the new TestResult. --- include/cppunit/TextTestResult.h | 49 +++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 18 deletions(-) (limited to 'include/cppunit/TextTestResult.h') diff --git a/include/cppunit/TextTestResult.h b/include/cppunit/TextTestResult.h index f238826..662a054 100644 --- a/include/cppunit/TextTestResult.h +++ b/include/cppunit/TextTestResult.h @@ -6,24 +6,37 @@ namespace CppUnit { - class Exception; - class Test; - - class TextTestResult : public TestResult - { - public: - virtual void addError (Test *test, Exception *e); - virtual void addFailure (Test *test, Exception *e); - virtual void startTest (Test *test); - virtual void print (std::ostream& stream); - virtual void printErrors (std::ostream& stream); - virtual void printFailures (std::ostream& stream); - virtual void printHeader (std::ostream& stream); - - }; - - /** insertion operator for easy output */ - std::ostream& operator<< (std::ostream& stream, TextTestResult& result); +class Exception; +class Test; + +class TextTestResult : public TestResult +{ + public: + virtual void addError( Test *test, Exception *e ); + virtual void addFailure( Test *test, Exception *e ); + virtual void startTest( Test *test ); + virtual void print( std::ostream &stream ); + virtual void printFailures( std::ostream &stream ); + virtual void printHeader( std::ostream &stream ); + + virtual void printFailure( TestFailure *failure, + int failureNumber, + std::ostream &stream ); + virtual void printFailureListMark( int failureNumber, + std::ostream &stream ); + virtual void printFailureTestName( TestFailure *failure, + std::ostream &stream ); + virtual void printFailureType( TestFailure *failure, + std::ostream &stream ); + virtual void printFailureLocation( Exception *thrownException, + std::ostream &stream ); + virtual void printFailureDetail( Exception *thrownException, + std::ostream &stream ); +}; + +/** insertion operator for easy output */ +std::ostream &operator <<( std::ostream &stream, + TextTestResult &result ); } // namespace CppUnit -- cgit v1.2.1