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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-07-26 19:26:08 +0100
committerPhil Nash2013-07-26 19:26:08 +0100
commite8cf726a23483083dcf534e70704cb860d6e1ffd (patch)
tree67a46d5896973affd315653238539de388b6f1a3 /include
parentb80280f42889425d15062a4e947bd2de1aaf38f3 (diff)
downloadcatch3-e8cf726a23483083dcf534e70704cb860d6e1ffd.tar.gz
Refactored missing assertions handling
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_runner_impl.hpp29
1 files changed, 11 insertions, 18 deletions
diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp
index 589003c7..ed51757c 100644
--- a/include/internal/catch_runner_impl.hpp
+++ b/include/internal/catch_runner_impl.hpp
@@ -194,6 +194,15 @@ namespace Catch {
return true;
}
+ bool testForMissingAssertions( Counts& assertions ) {
+ if( assertions.total() != 0 ||
+ !m_config->warnAboutMissingAssertions() ||
+ m_testCaseTracker->currentSectionHasChildren() )
+ return false;
+ m_totals.assertions.failed++;
+ assertions.failed++;
+ return true;
+ }
virtual void sectionEnded( SectionInfo const& info, Counts const& prevAssertions ) {
if( std::uncaught_exception() ) {
@@ -202,15 +211,8 @@ namespace Catch {
}
Counts assertions = m_totals.assertions - prevAssertions;
- bool missingAssertions = false;
- if( assertions.total() == 0 &&
- m_config->warnAboutMissingAssertions() &&
- !m_testCaseTracker->currentSectionHasChildren() ) {
- m_totals.assertions.failed++;
- assertions.failed++;
- missingAssertions = true;
+ bool missingAssertions = testForMissingAssertions( assertions );
- }
m_testCaseTracker->leaveSection();
m_reporter->sectionEnded( SectionStats( info, assertions, missingAssertions ) );
@@ -300,16 +302,7 @@ namespace Catch {
m_messages.clear();
Counts assertions = m_totals.assertions - prevAssertions;
-// !TBD?
- bool missingAssertions = false;
- if( assertions.total() == 0 &&
- m_config->warnAboutMissingAssertions() &&
- !m_testCaseTracker->currentSectionHasChildren() ) {
- m_totals.assertions.failed++;
- assertions.failed++;
- missingAssertions = true;
-
- }
+ bool missingAssertions = testForMissingAssertions( assertions );
SectionStats testCaseSectionStats( testCaseSection, assertions, missingAssertions );
m_reporter->sectionEnded( testCaseSectionStats );