Fixed reversed logic of NoAssertions warning check
(that explains the previous regressions)
diff --git a/include/internal/catch_run_context.hpp b/include/internal/catch_run_context.hpp
index a3098b5..6ae6756 100644
--- a/include/internal/catch_run_context.hpp
+++ b/include/internal/catch_run_context.hpp
@@ -169,7 +169,7 @@
bool testForMissingAssertions( Counts& assertions ) {
if( assertions.total() != 0 )
return false;
- if( m_config->warnAboutMissingAssertions() )
+ if( !m_config->warnAboutMissingAssertions() )
return false;
if( m_trackerContext.currentTracker().hasChildren() )
return false;
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index ad144d7..c222e30 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -494,28 +494,8 @@
Message from section two
Message from section one
--------------------------------------------------------------------------------
-Standard output from all sections is reported
- one
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'one'
-
Message from section two
-------------------------------------------------------------------------------
-Standard output from all sections is reported
- two
--------------------------------------------------------------------------------
-MessageTests.cpp:<line number>
-...............................................................................
-
-
-No assertions in section 'two'
-
--------------------------------------------------------------------------------
SCOPED_INFO is reset for each loop
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
@@ -817,6 +797,6 @@
"first" == "second"
===============================================================================
-test cases: 159 | 118 passed | 40 failed | 1 failed as expected
-assertions: 907 | 812 passed | 82 failed | 13 failed as expected
+test cases: 159 | 119 passed | 39 failed | 1 failed as expected
+assertions: 905 | 812 passed | 80 failed | 13 failed as expected
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 5fb5337..981fce1 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -2770,8 +2770,28 @@
Message from section two
Message from section one
+-------------------------------------------------------------------------------
+Standard output from all sections is reported
+ one
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'one'
+
Message from section two
-------------------------------------------------------------------------------
+Standard output from all sections is reported
+ two
+-------------------------------------------------------------------------------
+MessageTests.cpp:<line number>
+...............................................................................
+
+
+No assertions in section 'two'
+
+-------------------------------------------------------------------------------
SCOPED_INFO is reset for each loop
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
@@ -8923,6 +8943,6 @@
1 > 0
===============================================================================
-test cases: 159 | 119 passed | 39 failed | 1 failed as expected
-assertions: 905 | 812 passed | 80 failed | 13 failed as expected
+test cases: 159 | 118 passed | 40 failed | 1 failed as expected
+assertions: 907 | 812 passed | 82 failed | 13 failed as expected
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 40447d1..0766b19 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,5 @@
<testsuites>
- <testsuite name="CatchSelfTest" errors="12" failures="68" tests="905" hostname="tbd" time="{duration}" timestamp="tbd">
+ <testsuite name="CatchSelfTest" errors="12" failures="70" tests="907" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="toString(enum)" time="{duration}"/>
<testcase classname="global" name="toString(enum w/operator<<)" time="{duration}"/>
<testcase classname="global" name="toString(enum class)" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index ebe5c69..1bb662f 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -2949,12 +2949,12 @@
</TestCase>
<TestCase name="Standard output from all sections is reported">
<Section name="one">
- <OverallResults successes="0" failures="0" expectedFailures="0"/>
+ <OverallResults successes="0" failures="1" expectedFailures="0"/>
</Section>
<Section name="two">
- <OverallResults successes="0" failures="0" expectedFailures="0"/>
+ <OverallResults successes="0" failures="1" expectedFailures="0"/>
</Section>
- <OverallResult success="true"/>
+ <OverallResult success="false"/>
</TestCase>
<TestCase name="SCOPED_INFO is reset for each loop">
<Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" >
@@ -9422,7 +9422,7 @@
</Section>
<OverallResult success="true"/>
</TestCase>
- <OverallResults successes="812" failures="80" expectedFailures="13"/>
+ <OverallResults successes="812" failures="82" expectedFailures="13"/>
</Group>
- <OverallResults successes="812" failures="80" expectedFailures="13"/>
+ <OverallResults successes="812" failures="82" expectedFailures="13"/>
</Catch>