INFOs only reset at assertion if consumed

This commit is contained in:
Phil Nash
2013-06-28 16:25:49 +01:00
parent 239fa28e46
commit 0d357302a0
8 changed files with 18 additions and 13 deletions

View File

@@ -397,7 +397,8 @@ MessageTests.cpp:37: FAILED:
CHECK( a == 1 )
with expansion:
2 == 1
with message:
with messages:
this message may be logged later
this message should be logged
MessageTests.cpp:41: FAILED:
@@ -514,7 +515,8 @@ MiscTests.cpp:111: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
with messages:
Testing if fib[2] (2) is even
Testing if fib[3] (3) is even
MiscTests.cpp:111: FAILED:
@@ -528,7 +530,8 @@ MiscTests.cpp:111: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
with messages:
Testing if fib[5] (8) is even
Testing if fib[6] (13) is even
MiscTests.cpp:111: FAILED:
@@ -2786,7 +2789,7 @@ PASSED:
with expansion:
2 == 2
with message:
this message should not be logged
this message may be logged later
MessageTests.cpp:37: FAILED:
CHECK( a == 1 )

View File

@@ -28,7 +28,7 @@ TEST_CASE( "./failing/message/info/1", "INFO gets logged on failure" )
TEST_CASE( "./mixed/message/info/2", "INFO gets logged on failure" )
{
INFO( "this message should not be logged" );
INFO( "this message may be logged later" );
int a = 2;
CHECK( a == 2 );

View File

@@ -46,7 +46,7 @@ namespace Catch {
virtual void testCaseStarting( TestCaseInfo const& ) {}
virtual void sectionStarting( SectionInfo const& ) {}
virtual void assertionStarting( AssertionInfo const& ) {}
virtual void assertionEnded( AssertionStats const& ) {}
virtual bool assertionEnded( AssertionStats const& ) { return false; }
virtual void sectionEnded( SectionStats const& ) {}
virtual void testCaseEnded( TestCaseStats const& ) {}
virtual void testGroupEnded( TestGroupStats const& ) {}