diff options
| author | Phil Nash | 2015-11-03 07:46:37 +0000 |
|---|---|---|
| committer | Phil Nash | 2015-11-03 07:46:37 +0000 |
| commit | 015e07100eebdf0557fbd08154e6adc1cf128ae2 (patch) | |
| tree | 9718080b8a018cd447933155275f213d1aeb5005 /projects | |
| parent | bc8840cbb86fe57155620695714eb3936b85244b (diff) | |
| download | catch3-015e07100eebdf0557fbd08154e6adc1cf128ae2.tar.gz | |
Added SUCCEEDs to empty leaf sections to avoid failing due to no assertions
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/SelfTest/Baselines/console.std.approved.txt | 56 | ||||
| -rw-r--r-- | projects/SelfTest/Baselines/console.sw.approved.txt | 54 | ||||
| -rw-r--r-- | projects/SelfTest/Baselines/junit.sw.approved.txt | 7 | ||||
| -rw-r--r-- | projects/SelfTest/Baselines/xml.sw.approved.txt | 18 | ||||
| -rw-r--r-- | projects/SelfTest/MiscTests.cpp | 7 |
5 files changed, 75 insertions, 67 deletions
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 92c2624b..ad144d77 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -579,38 +579,6 @@ with expansion: 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 s1 ------------------------------------------------------------------------------- @@ -705,26 +673,6 @@ with expansion: 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 ------------------------------------------------------------------------------- MiscTests.cpp:<line number> @@ -869,6 +817,6 @@ with expansion: "first" == "second" =============================================================================== -test cases: 159 | 116 passed | 42 failed | 1 failed as expected -assertions: 907 | 807 passed | 87 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/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 8e2ba564..5fb53373 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -3028,6 +3028,38 @@ with expansion: 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 s1 ------------------------------------------------------------------------------- @@ -3192,6 +3224,26 @@ with expansion: 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 ------------------------------------------------------------------------------- MiscTests.cpp:<line number> @@ -8872,5 +8924,5 @@ with expansion: =============================================================================== 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 diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index a7ad8583..40447d11 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="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 w/operator<<)" time="{duration}"/> <testcase classname="global" name="toString(enum class)" time="{duration}"/> @@ -343,6 +343,9 @@ MiscTests.cpp:<line number> </testcase> <testcase classname="more nested SECTION tests" name="s1/s3" 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}"> <failure message="0 > 1" type="CHECK"> MiscTests.cpp:<line number> @@ -401,6 +404,8 @@ MiscTests.cpp:<line number> MiscTests.cpp:<line number> </failure> </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}"> <failure message="false" type="REQUIRE"> 3 diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index a11f61b4..ebe5c69b 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -3213,18 +3213,18 @@ <TestCase name="even more nested SECTION tests"> <Section name="c"> <Section name="d (leaf)"> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <Section name="c"> <Section name="e (leaf)"> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <Section name="f (leaf)"> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <OverallResult success="true"/> </TestCase> @@ -3427,10 +3427,10 @@ </TestCase> <TestCase name="xmlentitycheck"> <Section name="embedded xml" description="<test>it should be possible to embed xml characters, such as <, " or &, or even whole <xml>documents</xml> within an attribute</test>"> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <Section name="encoded chars" description="these should all be encoded: &&&"""<<<&"<<&""> - <OverallResults successes="0" failures="0" expectedFailures="0"/> + <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <OverallResult success="true"/> </TestCase> @@ -9422,7 +9422,7 @@ there" </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="807" failures="80" expectedFailures="13"/> + <OverallResults successes="812" failures="80" expectedFailures="13"/> </Group> - <OverallResults successes="807" failures="80" expectedFailures="13"/> + <OverallResults successes="812" failures="80" expectedFailures="13"/> </Catch> diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp index 36b8a608..e791cb10 100644 --- a/projects/SelfTest/MiscTests.cpp +++ b/projects/SelfTest/MiscTests.cpp @@ -80,15 +80,18 @@ TEST_CASE( "even more nested SECTION tests", "[sections]" ) { SECTION( "d (leaf)", "" ) { + SUCCEED(""); // avoid failing due to no tests } SECTION( "e (leaf)", "" ) { + SUCCEED(""); // avoid failing due to no tests } } 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>" ) { - // No test + SUCCEED(""); // We need this here to stop it failing due to no tests } SECTION( "encoded chars", "these should all be encoded: &&&\"\"\"<<<&\"<<&\"" ) { - // No test + SUCCEED(""); // We need this here to stop it failing due to no tests } } |