3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the output a bit 

- removed [!shouldfail] test from "green" path
- changed "spanner" to more descriptive text
This commit is contained in:
Phil Nash 2017-08-11 10:38:29 +01:00
parent 684cbb2631
commit df5c31bb19
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/SelfTest/Baselines/console.std.approved.txt
View File

@ -885,7 +885,8 @@ MiscTests.cpp:<line number>: FAILED:
with expansion:
false
spanner-------------------------------------------------------------------------------
loose text artifact
-------------------------------------------------------------------------------
just failure
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>

3
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@ -6600,7 +6600,8 @@ MiscTests.cpp:<line number>
MiscTests.cpp:<line number>:
PASSED:
spanner-------------------------------------------------------------------------------
loose text artifact
-------------------------------------------------------------------------------
just failure
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>

3
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuitesspanner>
<testsuitesloose text artifact
>
<testsuite name="<exe-name>" errors="15" failures="87" tests="902" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/>
<testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}">

7
projects/SelfTest/Baselines/xml.sw.approved.txt
View File

@ -4,7 +4,7 @@
<TestCase name="# A test name that starts with a #" filename="projects/<exe-name>/MiscTests.cpp" >
<OverallResult success="true"/>
</TestCase>
<TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws]" filename="projects/<exe-name>/ExceptionTests.cpp" >
<TestCase name="#748 - captures with unexpected exceptions" tags="[!shouldfail][!throws][.][failing][hide]" filename="projects/<exe-name>/ExceptionTests.cpp" >
<Section name="outside assertions" filename="projects/<exe-name>/ExceptionTests.cpp" >
<Info>
answer := 42
@ -117,7 +117,7 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
<TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail]" filename="projects/<exe-name>/MiscTests.cpp" >
<TestCase name="#835 -- errno should not be touched by Catch" tags="[!shouldfail][.][failing][hide]" filename="projects/<exe-name>/MiscTests.cpp" >
<Expression success="false" type="CHECK" filename="projects/<exe-name>/MiscTests.cpp" >
<Original>
f() == 0
@ -7398,7 +7398,8 @@ Message from section two
<OverallResult success="true"/>
</TestCase>
<TestCase name="has printf" filename="projects/<exe-name>/TrickyTests.cpp" >
spanner <OverallResult success="true"/>
loose text artifact
<OverallResult success="true"/>
</TestCase>
<TestCase name="just failure" tags="[.][fail][hide][isolated info][messages]" filename="projects/<exe-name>/MessageTests.cpp" >
<Failure filename="projects/<exe-name>/MessageTests.cpp" >

2
projects/SelfTest/ExceptionTests.cpp
View File

@ -205,7 +205,7 @@ TEST_CASE( "Mismatching exception messages failing the test", "[.][failing][!thr
REQUIRE_THROWS_WITH( thisThrows(), "expected exception" );
}
TEST_CASE( "#748 - captures with unexpected exceptions", "[!shouldfail][!throws]" ) {
TEST_CASE( "#748 - captures with unexpected exceptions", "[.][failing][!throws][!shouldfail]" ) {
int answer = 42;
CAPTURE( answer );
// the message should be printed on the first two sections but not on the third

2
projects/SelfTest/MiscTests.cpp
View File

@ -353,7 +353,7 @@ static int f() {
return 1;
}
TEST_CASE( "#835 -- errno should not be touched by Catch", "[!shouldfail]" ) {
TEST_CASE( "#835 -- errno should not be touched by Catch", "[.][failing][!shouldfail]" ) {
errno = 1;
CHECK(f() == 0);
REQUIRE(errno == 1); // Check that f() doesn't touch errno.

4
projects/SelfTest/TrickyTests.cpp
View File

@ -396,8 +396,8 @@ TEST_CASE( "X/level/1/b", "[Tricky]" ) { SUCCEED(""); }
TEST_CASE( "has printf" ) {
// This can cause problems as, currently, stdout itself is not redirect - only the cout (and cerr) buffer
printf( "spanner" );
// This can cause problems as, currently, stdout itself is not redirected - only the cout (and cerr) buffer
printf( "loose text artifact\n" );
}
TEST_CASE( "assertions with commas are allowed" ) {