Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorPhil Nash2013-06-28 16:25:49 +0100
committerPhil Nash2013-06-28 16:25:49 +0100
commit0d357302a01b66ae7cd55ff44266ebddd57328de (patch)
treeef0a0f31bf0464781bcc3f7c43d3585b9df50fc4 /projects
parent239fa28e4679b2889b715f98243d2af380beadaf (diff)
downloadcatch3-0d357302a01b66ae7cd55ff44266ebddd57328de.tar.gz
INFOs only reset at assertion if consumed
Diffstat (limited to 'projects')
-rw-r--r--projects/SelfTest/Baselines/approvedResults.txt11
-rw-r--r--projects/SelfTest/MessageTests.cpp2
-rw-r--r--projects/SelfTest/catch_self_test.hpp2
3 files changed, 9 insertions, 6 deletions
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 1de7f385..215ed606 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -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 )
diff --git a/projects/SelfTest/MessageTests.cpp b/projects/SelfTest/MessageTests.cpp
index 33f14ce2..9ba6eaec 100644
--- a/projects/SelfTest/MessageTests.cpp
+++ b/projects/SelfTest/MessageTests.cpp
@@ -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 );
diff --git a/projects/SelfTest/catch_self_test.hpp b/projects/SelfTest/catch_self_test.hpp
index 6ce00738..1629644d 100644
--- a/projects/SelfTest/catch_self_test.hpp
+++ b/projects/SelfTest/catch_self_test.hpp
@@ -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& ) {}