cppunit-cvs

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/src/cpput
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2587/src/cpput

Modified Files:
	assert.cpp lighttestrunner.cpp 
Log Message:
* Enhanced failure report output

Index: lighttestrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/lighttestrunner.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lighttestrunner.cpp	9 Aug 2005 08:05:32 -0000	1.5
--- lighttestrunner.cpp	10 Aug 2005 07:45:23 -0000	1.6
***************
*** 35,39 ****
     if ( testFailed_ > 0 )
     {
!       printf( "Failure report:\n%s\n", report_.c_str() );
        printf( "%d/%d tests passed, %d tests failed.", 
                testRun_ - testFailed_,
--- 35,39 ----
     if ( testFailed_ > 0 )
     {
!       printf( "Failure report:\n%s", report_.c_str() );
        printf( "%d/%d tests passed, %d tests failed.", 
                testRun_ - testFailed_,
***************
*** 127,131 ****
  LightTestRunner::reportFailure( const Assertion &failure )
  { // @todo duplicated in Assertion::toString().
-    report_ += "* ";
     if ( failure.location().isValid() )
     {
--- 127,130 ----
***************
*** 147,150 ****
--- 146,150 ----
        report_ += testData.toString() + "\n";
     }
+    report_ += "\n";
  }
  

Index: assert.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/assert.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** assert.cpp	8 Aug 2005 22:10:21 -0000	1.11
--- assert.cpp	10 Aug 2005 07:45:23 -0000	1.12
***************
*** 25,29 ****
  
     Message newMessage( message );
!    newMessage.insertAt( 0, translate( "Assertion failed: expression did not evaluate to true." ) );
     fail( newMessage );
  }
--- 25,29 ----
  
     Message newMessage( message );
!    newMessage.insertAt( 0, translate( "expression did not evaluate to true." ) );
     fail( newMessage );
  }
***************
*** 38,42 ****
  
     Message newMessage( message );
!    newMessage.insertAt( 0, translate( "Assertion failed: expression did not evaluate to false." ) );
     fail( newMessage );
  }
--- 38,42 ----
  
     Message newMessage( message );
!    newMessage.insertAt( 0, translate( "expression did not evaluate to false." ) );
     fail( newMessage );
  }