[Cppunit-cvs] cppunit2/src/cpput lighttestrunner.cpp,1.12,1.13

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

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

Modified Files:
	lighttestrunner.cpp 
Log Message:
* Number of failed assertions and number of assertions made (non-aborting & aborting) is now displayed as each test run. This give a good idea when a test fail and has a large number of checking assertions how many of them are failing...

Index: lighttestrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/lighttestrunner.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lighttestrunner.cpp	11 Nov 2005 20:54:15 -0000	1.12
--- lighttestrunner.cpp	26 Jun 2008 16:27:19 -0000	1.13
***************
*** 109,117 ****
     }
  
     if ( testStatus.ignoredFailureCount() > 0 )
     {
        std::string count = CppTL::toString( testStatus.ignoredFailureCount() ).c_str();
!       status += " (" + count + " ignored failures)";
     }
  
     fprintf( stdout, "%s\n", status.c_str() );
--- 109,131 ----
     }
  
+    int assertionCount = testStatus.assertionCount();
+    status += " (";
+    unsigned int failedAssertionCount = testStatus.failedAssertionCount();
+    if ( failedAssertionCount > 0 )
+    {
+       std::string count = CppTL::toString( failedAssertionCount ).c_str();
+       status += count + (failedAssertionCount > 1 ? " assertions failed/" 
+                                                     : " assertion failed/");
+    }
+ 
+    status += CppTL::toString( assertionCount ).c_str();
+    status += (assertionCount > 1 ? " assertions" : " assertion" );
+ 
     if ( testStatus.ignoredFailureCount() > 0 )
     {
        std::string count = CppTL::toString( testStatus.ignoredFailureCount() ).c_str();
!       status += ", " + count + " ignored failures";
     }
+    status += ")";
  
     fprintf( stdout, "%s\n", status.c_str() );