3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-modernize

Browse Source
This commit is contained in:
Martin Hořeňovský
2017-08-10 11:34:26 +02:00
parent e658bacb04 7e4038d848
commit aa42dd92d1
24 changed files with 281 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -671,6 +671,9 @@ with messages:
A string sent directly to stdout
A string sent directly to stderr
Write to std::cerr
Write to std::clog
Interleaved writes to error streams
Message from section one
Message from section two
-------------------------------------------------------------------------------
@@ -1016,6 +1019,6 @@ with expansion:
"{?}" == "1"
===============================================================================
test cases: 182 | 131 passed | 47 failed | 4 failed as expected
test cases: 183 | 132 passed | 47 failed | 4 failed as expected
assertions: 896 | 779 passed | 96 failed | 21 failed as expected

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

@@ -4177,6 +4177,39 @@ PASSED:
with expansion:
Approx( 1.23 ) != 1.24
Write to std::cerr
-------------------------------------------------------------------------------
Standard error is reported and redirected
std::cerr
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
...............................................................................
No assertions in section 'std::cerr'
Write to std::clog
-------------------------------------------------------------------------------
Standard error is reported and redirected
std::clog
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
...............................................................................
No assertions in section 'std::clog'
Interleaved writes to error streams
-------------------------------------------------------------------------------
Standard error is reported and redirected
Interleaved writes to cerr and clog
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
...............................................................................
No assertions in section 'Interleaved writes to cerr and clog'
Message from section one
-------------------------------------------------------------------------------
Standard output from all sections is reported
@@ -7590,6 +7623,6 @@ MiscTests.cpp:<line number>:
PASSED:
===============================================================================
test cases: 182 | 130 passed | 48 failed | 4 failed as expected
assertions: 898 | 779 passed | 98 failed | 21 failed as expected
test cases: 183 | 130 passed | 49 failed | 4 failed as expected
assertions: 901 | 779 passed | 101 failed | 21 failed as expected

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuitesspanner>
<testsuite name="<exe-name>" errors="15" failures="84" tests="899" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<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}">
<error type="TEST_CASE">
@@ -486,6 +486,13 @@ A string sent directly to stderr
</system-err>
</testcase>
<testcase classname="<exe-name>.global" name="Some simple comparisons between doubles" time="{duration}"/>
<testcase classname="<exe-name>.global" name="Standard error is reported and redirected/Interleaved writes to cerr and clog" time="{duration}">
<system-err>
Write to std::cerr
Write to std::clog
Interleaved writes to error streams
</system-err>
</testcase>
<testcase classname="<exe-name>.global" name="Standard output from all sections is reported/two" time="{duration}">
<system-out>
Message from section one
@@ -792,6 +799,9 @@ Message from section two
</system-out>
<system-err>
A string sent directly to stderr
Write to std::cerr
Write to std::clog
Interleaved writes to error streams
</system-err>
</testsuite>
</testsuites>

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

@@ -4817,6 +4817,24 @@ A string sent directly to stderr
</Expression>
<OverallResult success="true"/>
</TestCase>
<TestCase name="Standard error is reported and redirected" tags="[.][hide][messages]" filename="projects/<exe-name>/MessageTests.cpp" >
<Section name="std::cerr" filename="projects/<exe-name>/MessageTests.cpp" >
<OverallResults successes="0" failures="1" expectedFailures="0"/>
</Section>
<Section name="std::clog" filename="projects/<exe-name>/MessageTests.cpp" >
<OverallResults successes="0" failures="1" expectedFailures="0"/>
</Section>
<Section name="Interleaved writes to cerr and clog" filename="projects/<exe-name>/MessageTests.cpp" >
<OverallResults successes="0" failures="1" expectedFailures="0"/>
</Section>
<OverallResult success="false">
<StdErr>
Write to std::cerr
Write to std::clog
Interleaved writes to error streams
</StdErr>
</OverallResult>
</TestCase>
<TestCase name="Standard output from all sections is reported" tags="[.][hide][messages]" filename="projects/<exe-name>/MessageTests.cpp" >
<Section name="one" filename="projects/<exe-name>/MessageTests.cpp" >
<OverallResults successes="0" failures="1" expectedFailures="0"/>
@@ -8441,7 +8459,7 @@ spanner <OverallResult success="true"/>
</Section>
<OverallResult success="true"/>
</TestCase>
<OverallResults successes="779" failures="99" expectedFailures="21"/>
<OverallResults successes="779" failures="102" expectedFailures="21"/>
</Group>
<OverallResults successes="779" failures="98" expectedFailures="21"/>
<OverallResults successes="779" failures="101" expectedFailures="21"/>
</Catch>

17
projects/SelfTest/MessageTests.cpp
View File

@@ -85,6 +85,23 @@ TEST_CASE( "Standard output from all sections is reported", "[messages][.]" ) {
}
}
TEST_CASE( "Standard error is reported and redirected", "[messages][.]" ) {
SECTION( "std::cerr" ) {
std::cerr << "Write to std::cerr" << std::endl;
}
SECTION( "std::clog" ) {
std::clog << "Write to std::clog" << std::endl;
}
SECTION( "Interleaved writes to cerr and clog" ) {
std::cerr << "Inter";
std::clog << "leaved";
std::cerr << ' ';
std::clog << "writes";
std::cerr << " to error";
std::clog << " streams\n";
}
}
TEST_CASE( "SCOPED_INFO is reset for each loop", "[messages][failing][.]" ) {
for( int i=0; i<100; i++ )
{