Added SUCCEEDs to empty leaf sections to avoid failing due to no assertions

This commit is contained in:
Phil Nash 2015-11-03 07:46:37 +00:00
parent bc8840cbb8
commit 015e07100e
5 changed files with 75 additions and 67 deletions

View File

@ -578,38 +578,6 @@ MiscTests.cpp:<line number>: FAILED:
with expansion: with expansion:
1 == 2 1 == 2
-------------------------------------------------------------------------------
even more nested SECTION tests
c
d (leaf)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
No assertions in section 'd (leaf)'
-------------------------------------------------------------------------------
even more nested SECTION tests
c
e (leaf)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
No assertions in section 'e (leaf)'
-------------------------------------------------------------------------------
even more nested SECTION tests
f (leaf)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
No assertions in section 'f (leaf)'
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
looped SECTION tests looped SECTION tests
s1 s1
@ -704,26 +672,6 @@ MiscTests.cpp:<line number>: FAILED:
with expansion: with expansion:
false false
-------------------------------------------------------------------------------
xmlentitycheck
embedded xml
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
No assertions in section 'embedded xml'
-------------------------------------------------------------------------------
xmlentitycheck
encoded chars
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
No assertions in section 'encoded chars'
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
send a single char to INFO send a single char to INFO
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -869,6 +817,6 @@ with expansion:
"first" == "second" "first" == "second"
=============================================================================== ===============================================================================
test cases: 159 | 116 passed | 42 failed | 1 failed as expected test cases: 159 | 118 passed | 40 failed | 1 failed as expected
assertions: 907 | 807 passed | 87 failed | 13 failed as expected assertions: 907 | 812 passed | 82 failed | 13 failed as expected

View File

@ -3027,6 +3027,38 @@ PASSED:
with expansion: with expansion:
1 < 2 1 < 2
-------------------------------------------------------------------------------
even more nested SECTION tests
c
d (leaf)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
-------------------------------------------------------------------------------
even more nested SECTION tests
c
e (leaf)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
-------------------------------------------------------------------------------
even more nested SECTION tests
f (leaf)
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
looped SECTION tests looped SECTION tests
s1 s1
@ -3191,6 +3223,26 @@ MiscTests.cpp:<line number>: FAILED:
with expansion: with expansion:
false false
-------------------------------------------------------------------------------
xmlentitycheck
embedded xml
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
-------------------------------------------------------------------------------
xmlentitycheck
encoded chars
-------------------------------------------------------------------------------
MiscTests.cpp:<line number>
...............................................................................
MiscTests.cpp:<line number>:
PASSED:
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
send a single char to INFO send a single char to INFO
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -8872,5 +8924,5 @@ with expansion:
=============================================================================== ===============================================================================
test cases: 159 | 119 passed | 39 failed | 1 failed as expected test cases: 159 | 119 passed | 39 failed | 1 failed as expected
assertions: 900 | 807 passed | 80 failed | 13 failed as expected assertions: 905 | 812 passed | 80 failed | 13 failed as expected

View File

@ -1,5 +1,5 @@
<testsuites> <testsuites>
<testsuite name="CatchSelfTest" errors="12" failures="68" tests="900" hostname="tbd" time="{duration}" timestamp="tbd"> <testsuite name="CatchSelfTest" errors="12" failures="68" tests="905" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="toString(enum)" time="{duration}"/> <testcase classname="global" name="toString(enum)" time="{duration}"/>
<testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/> <testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
<testcase classname="global" name="toString(enum class)" time="{duration}"/> <testcase classname="global" name="toString(enum class)" time="{duration}"/>
@ -343,6 +343,9 @@ MiscTests.cpp:<line number>
</testcase> </testcase>
<testcase classname="more nested SECTION tests" name="s1/s3" time="{duration}"/> <testcase classname="more nested SECTION tests" name="s1/s3" time="{duration}"/>
<testcase classname="more nested SECTION tests" name="s1/s4" time="{duration}"/> <testcase classname="more nested SECTION tests" name="s1/s4" time="{duration}"/>
<testcase classname="even more nested SECTION tests" name="c/d (leaf)" time="{duration}"/>
<testcase classname="even more nested SECTION tests" name="c/e (leaf)" time="{duration}"/>
<testcase classname="even more nested SECTION tests" name="f (leaf)" time="{duration}"/>
<testcase classname="looped SECTION tests" name="s1" time="{duration}"> <testcase classname="looped SECTION tests" name="s1" time="{duration}">
<failure message="0 > 1" type="CHECK"> <failure message="0 > 1" type="CHECK">
MiscTests.cpp:<line number> MiscTests.cpp:<line number>
@ -401,6 +404,8 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number> MiscTests.cpp:<line number>
</failure> </failure>
</testcase> </testcase>
<testcase classname="xmlentitycheck" name="embedded xml" time="{duration}"/>
<testcase classname="xmlentitycheck" name="encoded chars" time="{duration}"/>
<testcase classname="global" name="send a single char to INFO" time="{duration}"> <testcase classname="global" name="send a single char to INFO" time="{duration}">
<failure message="false" type="REQUIRE"> <failure message="false" type="REQUIRE">
3 3

View File

@ -3213,18 +3213,18 @@
<TestCase name="even more nested SECTION tests"> <TestCase name="even more nested SECTION tests">
<Section name="c"> <Section name="c">
<Section name="d (leaf)"> <Section name="d (leaf)">
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<Section name="c"> <Section name="c">
<Section name="e (leaf)"> <Section name="e (leaf)">
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<Section name="f (leaf)"> <Section name="f (leaf)">
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
@ -3427,10 +3427,10 @@
</TestCase> </TestCase>
<TestCase name="xmlentitycheck"> <TestCase name="xmlentitycheck">
<Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>"> <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>">
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;"> <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;">
<OverallResults successes="0" failures="0" expectedFailures="0"/> <OverallResults successes="1" failures="0" expectedFailures="0"/>
</Section> </Section>
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
@ -9422,7 +9422,7 @@ there"
</Section> </Section>
<OverallResult success="true"/> <OverallResult success="true"/>
</TestCase> </TestCase>
<OverallResults successes="807" failures="80" expectedFailures="13"/> <OverallResults successes="812" failures="80" expectedFailures="13"/>
</Group> </Group>
<OverallResults successes="807" failures="80" expectedFailures="13"/> <OverallResults successes="812" failures="80" expectedFailures="13"/>
</Catch> </Catch>

View File

@ -80,15 +80,18 @@ TEST_CASE( "even more nested SECTION tests", "[sections]" )
{ {
SECTION( "d (leaf)", "" ) SECTION( "d (leaf)", "" )
{ {
SUCCEED(""); // avoid failing due to no tests
} }
SECTION( "e (leaf)", "" ) SECTION( "e (leaf)", "" )
{ {
SUCCEED(""); // avoid failing due to no tests
} }
} }
SECTION( "f (leaf)", "" ) SECTION( "f (leaf)", "" )
{ {
SUCCEED(""); // avoid failing due to no tests
} }
} }
@ -177,11 +180,11 @@ TEST_CASE( "xmlentitycheck", "" )
{ {
SECTION( "embedded xml", "<test>it should be possible to embed xml characters, such as <, \" or &, or even whole <xml>documents</xml> within an attribute</test>" ) SECTION( "embedded xml", "<test>it should be possible to embed xml characters, such as <, \" or &, or even whole <xml>documents</xml> within an attribute</test>" )
{ {
// No test SUCCEED(""); // We need this here to stop it failing due to no tests
} }
SECTION( "encoded chars", "these should all be encoded: &&&\"\"\"<<<&\"<<&\"" ) SECTION( "encoded chars", "these should all be encoded: &&&\"\"\"<<<&\"<<&\"" )
{ {
// No test SUCCEED(""); // We need this here to stop it failing due to no tests
} }
} }