This commit is contained in:
Phil Nash
2013-12-14 14:34:05 +00:00
parent 563429d9a3
commit 859760abb4
7 changed files with 111 additions and 22 deletions

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)

View File

@@ -2572,6 +2572,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
@@ -6359,6 +6367,18 @@ PASSED:
with expansion:
__null == 0
-------------------------------------------------------------------------------
null_ptr
-------------------------------------------------------------------------------
TrickyTests.cpp:<line number>
...............................................................................
TrickyTests.cpp:<line number>:
PASSED:
REQUIRE( ptr.get() == std::__1::__get_nullptr_t() )
with expansion:
__null == nullptr
-------------------------------------------------------------------------------
X/level/0/a
-------------------------------------------------------------------------------
@@ -7123,5 +7143,5 @@ with expansion:
true
===============================================================================
120 test cases - 50 failed (692 assertions - 109 failed)
122 test cases - 51 failed (694 assertions - 110 failed)

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}"/>
@@ -259,6 +259,11 @@ MessageTests.cpp:<line number>
<testcase classname="global" name="FAIL aborts the test" time="{duration}">
<failure type="FAIL">
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>
@@ -509,6 +514,7 @@ TrickyTests.cpp:<line number>
<testcase classname="global" name="non streamable - with conv. op" time="{duration}"/>
<testcase classname="global" name="Comparing function pointers" time="{duration}"/>
<testcase classname="global" name="pointer to class" time="{duration}"/>
<testcase classname="global" name="null_ptr" time="{duration}"/>
<testcase classname="global" name="X/level/0/a" time="{duration}"/>
<testcase classname="global" name="X/level/0/b" time="{duration}"/>
<testcase classname="global" name="X/level/1/a" time="{duration}"/>

View File

@@ -2730,6 +2730,10 @@
</Failure>
<OverallResult success="false"/>
</TestCase>
<TestCase name="FAIL does not require an argument">
<Failure/>
<OverallResult success="false"/>
</TestCase>
<TestCase name="Output from all sections is reported">
<Section name="one">
<Failure>
@@ -6646,6 +6650,17 @@ there&quot;
</Expression>
<OverallResult success="true"/>
</TestCase>
<TestCase name="null_ptr">
<Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
<Original>
ptr.get() == std::__1::__get_nullptr_t()
</Original>
<Expanded>
__null == nullptr
</Expanded>
</Expression>
<OverallResult success="true"/>
</TestCase>
<TestCase name="X/level/0/a">
<OverallResult success="true"/>
</TestCase>
@@ -7398,7 +7413,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>