3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-04 14:09:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge from upstream

Browse Source
This commit is contained in:
Malcolm Noyes
2013-12-16 11:31:14 +00:00
parent a3a56158f0 66d641af64
commit b019773537
14 changed files with 198 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,6 +428,14 @@ MessageTests.cpp:<line number>: FAILED:
explicitly with message:
This is a failure
-------------------------------------------------------------------------------
FAIL does not require an argument
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
...............................................................................
MessageTests.cpp:<line number>: FAILED:
-------------------------------------------------------------------------------
Output from all sections is reported
one
@@ -742,5 +750,5 @@ with expansion:
"first" == "second"
===============================================================================
120 test cases - 35 failed (673 assertions - 90 failed)
122 test cases - 36 failed (675 assertions - 91 failed)

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

@@ -2572,6 +2572,23 @@ MessageTests.cpp:<line number>: FAILED:
explicitly with message:
This is a failure
-------------------------------------------------------------------------------
FAIL does not require an argument
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
...............................................................................
MessageTests.cpp:<line number>: FAILED:
-------------------------------------------------------------------------------
SUCCESS does not require an argument
-------------------------------------------------------------------------------
MessageTests.cpp:<line number>
...............................................................................
MessageTests.cpp:<line number>:
PASSED:
-------------------------------------------------------------------------------
Output from all sections is reported
one
@@ -7123,5 +7140,5 @@ with expansion:
true
===============================================================================
120 test cases - 50 failed (692 assertions - 109 failed)
122 test cases - 51 failed (694 assertions - 110 failed)

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

@@ -1,5 +1,5 @@
<testsuites>
<testsuite name="~_" errors="10" failures="99" tests="692" hostname="tbd" time="{duration}" timestamp="tbd">
<testsuite name="~_" errors="10" failures="100" tests="694" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
<testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
<testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
@@ -262,6 +262,12 @@ This is a failure
MessageTests.cpp:<line number>
</failure>
</testcase>
<testcase classname="global" name="FAIL does not require an argument" time="{duration}">
<failure type="FAIL">
MessageTests.cpp:<line number>
</failure>
</testcase>
<testcase classname="global" name="SUCCESS does not require an argument" time="{duration}"/>
<testcase classname="Output from all sections is reported" name="one" time="{duration}">
<failure type="FAIL">
Message from section one

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

@@ -2730,6 +2730,13 @@
</Failure>
<OverallResult success="false"/>
</TestCase>
<TestCase name="FAIL does not require an argument">
<Failure/>
<OverallResult success="false"/>
</TestCase>
<TestCase name="SUCCESS does not require an argument">
<OverallResult success="true"/>
</TestCase>
<TestCase name="Output from all sections is reported">
<Section name="one">
<Failure>
@@ -7398,7 +7405,7 @@ there&quot;
</Section>
<OverallResult success="true"/>
</TestCase>
<OverallResults successes="583" failures="109"/>
<OverallResults successes="584" failures="110"/>
</Group>
<OverallResults successes="583" failures="109"/>
<OverallResults successes="584" failures="110"/>
</Catch>

14
projects/SelfTest/MessageTests.cpp
View File

@@ -50,10 +50,20 @@ namespace MessageTests
TEST_CASE( "FAIL aborts the test", "[failing][messages][.]" )
{
if( Catch::isTrue( true ) )
FAIL( "This is a " << "failure" ); // This should output the message and abort
FAIL( "This is a " << "failure" ); // This should output the message and abort
}
#ifdef CATCH_CONFIG_VARIADIC_MACROS
TEST_CASE( "FAIL does not require an argument", "[failing][messages][.]" )
{
FAIL();
}
TEST_CASE( "SUCCESS does not require an argument", "[messages][.]" )
{
SUCCEED();
}
#endif
TEST_CASE( "Output from all sections is reported", "[failing][messages][.]" )
{
SECTION( "one", "" )