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

Replaced currentSectionInfo and m_rootSection with m_sectionStack

Browse Source
This commit is contained in:
Phil Nash
2013-08-08 08:05:19 +01:00
parent 6339254cb2
commit 29ccaa67ad
5 changed files with 59 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
projects/SelfTest/Baselines/approvedResults.txt
View File

@@ -670,8 +670,6 @@ MiscTests.cpp: FAILED:
explicitly with message:
to infinity and beyond
starting...
finished in 0.322593
Message from section one
Message from section two
Some information
@@ -710,7 +708,7 @@ with expansion:
"first" == "second"
===============================================================================
122 test cases - 35 failed (738 assertions - 90 failed)
121 test cases - 35 failed (737 assertions - 90 failed)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4318,19 +4316,6 @@ MiscTests.cpp: FAILED:
explicitly with message:
to infinity and beyond
starting...
finished in 0.323247
-------------------------------------------------------------------------------
Timer
-------------------------------------------------------------------------------
MiscTests.cpp
...............................................................................
MiscTests.cpp:
PASSED:
with message:
yay
-------------------------------------------------------------------------------
selftest/main
selftest/expected result
@@ -7184,13 +7169,13 @@ with expansion:
true
===============================================================================
122 test cases - 50 failed (757 assertions - 109 failed)
121 test cases - 50 failed (756 assertions - 109 failed)
No test cases matched '~dummy 4'
No tests ran
<testsuites>
<testsuite name="~dummy" errors="10" failures="81" tests="757" hostname="tbd" time="" timestamp="tbd">
<testsuite name="~dummy" errors="10" failures="81" tests="756" hostname="tbd" time="" timestamp="tbd">
<testcase classname="global" name="./succeeding/Approx/simple" time="0"/>
<testcase classname="global" name="./succeeding/Approx/epsilon" time="0"/>
<testcase classname="global" name="./succeeding/Approx/float" time="0"/>
@@ -7639,12 +7624,6 @@ MiscTests.cpp
MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="Timer" time="0">
<system-out>
starting...
finished in 0.322247
</system-out>
</testcase>
<testcase classname="global" name="selftest/main" time="0">
<system-out>
Message from section one
@@ -7728,9 +7707,6 @@ Message from section two
Some information
starting...
finished in 0.322247
Message from section one
Message from section two
Some information
@@ -11438,9 +11414,6 @@ An error
</Failure>
<OverallResult success="false"/>
</TestCase>
<TestCase name="Timer">
<OverallResult success="true"/>
</TestCase>
<TestCase name="selftest/main">
<Section name="selftest/expected result" description="Tests do what they claim">
<OverallResults successes="0" failures="0"/>
@@ -14096,7 +14069,7 @@ there&quot;
</Section>
<OverallResult success="true"/>
</TestCase>
<OverallResults successes="648" failures="109"/>
<OverallResults successes="647" failures="109"/>
</Group>
<OverallResults successes="648" failures="109"/>
<OverallResults successes="647" failures="109"/>
</Catch>

42
projects/SelfTest/MiscTests.cpp
View File

@@ -343,24 +343,24 @@ TEST_CASE("./failing/CatchSectionInfiniteLoop", "")
}
#include "internal/catch_timer.h"
TEST_CASE( "Timer", "[work-in-progress]" )
{
Catch::Timer t;
t.start();
std::cout << "starting..." << std::endl;
double d = 0;
for( int i = 0; i < 100000; ++i )
for( int j = 0; j < 1000; ++j )
d += (double)i*(double)j;
double duration = t.getElapsedSeconds();
std::cout << "finished in " << duration << std::endl;
SUCCEED("yay");
}
//#include "internal/catch_timer.h"
//
//TEST_CASE( "Timer", "[work-in-progress]" )
//{
// Catch::Timer t;
// t.start();
//
// std::cout << "starting..." << std::endl;
//
// double d = 0;
// for( int i = 0; i < 100000; ++i )
// for( int j = 0; j < 1000; ++j )
// d += (double)i*(double)j;
//
// double duration = t.getElapsedSeconds();
//
// std::cout << "finished in " << duration << std::endl;
//
// SUCCEED("yay");
//
//}