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

Fixed section ordering issue

Browse Source 
If a branch section completes without running any inner sections it will no run subsequent sections (until the next isolated run).
This commit is contained in:
Phil Nash
2012-05-05 19:32:52 +01:00
parent b213202ad7
commit a976c07b8d
7 changed files with 356 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
projects/SelfTest/MiscTests.cpp
View File

@@ -96,26 +96,33 @@ TEST_CASE( "Sections/nested3", "nested SECTION tests" )
runner.runMatching( "./Sections/nested/a/b", "mock" );
CHECK( runner.getLog() ==
"[tc]( ./Sections/nested/a/b ){ "
"[g]( test case run ){ "
"[s]( c ){ "
"[s]( d (leaf) ){ } [s]( d (leaf) ) "
"} [s]( c ) "
"} [g]( test case run )"
"[g]( test case run ){ "
"[s]( c ){ "
"[s]( e (leaf) ){ } [s]( e (leaf) ) "
"} [s]( c ) "
"} [g]( test case run )"
"[g]( test case run ){ "
"[s]( c ){ } [s]( c ) "
"[s]( f (leaf) ){ } [s]( f (leaf) ) "
"} [g]( test case run ) "
"} [tc]( ./Sections/nested/a/b )" );
"\\[tc] ./Sections/nested/a/b\n"
" \\[g] test case run\n"
" \\ [s] c\n"
" \\ [s] d (leaf)\n"
" / [s] d (leaf)\n"
" / [s] c\n"
" /[g] test case run\n"
" \\[g] test case run\n"
" \\ [s] c\n"
" \\ [s] e (leaf)\n"
" / [s] e (leaf)\n"
" / [s] c\n"
" /[g] test case run\n"
" \\[g] test case run\n"
" \\ [s] c\n"
" / [s] c\n"
" /[g] test case run\n"
" \\[g] test case run\n"
" \\ [s] f (leaf)\n"
" / [s] f (leaf)\n"
" /[g] test case run\n"
"/[tc] ./Sections/nested/a/b\n" );
}

44
projects/SelfTest/catch_self_test.hpp
View File

@@ -95,8 +95,7 @@ namespace Catch
const std::string& groupName
)
{
if( shouldRecord( recordGroups ) )
m_log << recordGroups << "( " << groupName << " ){ ";
openLabel( recordGroups, groupName );
}
virtual void EndGroup
@@ -105,8 +104,7 @@ namespace Catch
const Totals& totals
)
{
if( shouldRecord( recordGroups ) )
m_log << " } " << recordGroups << "( " << groupName << " )";
closeLabel( recordGroups, groupName );
}
virtual void StartSection
@@ -115,8 +113,7 @@ namespace Catch
const std::string description
)
{
if( shouldRecord( recordSections ) )
m_log << recordSections << "( " << sectionName << " ){ ";
openLabel( recordSections, sectionName );
}
virtual void EndSection
@@ -125,8 +122,7 @@ namespace Catch
const Counts& assertions
)
{
if( shouldRecord( recordSections ) )
m_log << " } " << recordSections << "( " << sectionName << " )";
closeLabel( recordSections, sectionName );
}
virtual void StartTestCase
@@ -134,8 +130,7 @@ namespace Catch
const TestCaseInfo& testInfo
)
{
if( shouldRecord( recordTestCases ) )
m_log << recordTestCases << "( " << testInfo.getName() << " ){ ";
openLabel( recordTestCases, testInfo.getName() );
}
virtual void EndTestCase
@@ -146,8 +141,7 @@ namespace Catch
const std::string& stdErr
)
{
if( shouldRecord( recordTestCases ) )
m_log << " } " << recordTestCases << "( " << testInfo.getName() << " )";
closeLabel( recordTestCases, testInfo.getName() );
}
virtual void Result
@@ -214,6 +208,32 @@ namespace Catch
{
return m_recorders.find( recorder ) != m_recorders.end();
}
void openLabel( const std::string& label, const std::string& arg = "" )
{
if( shouldRecord( label ) )
{
m_log << m_indent << "\\" << label;
if( !arg.empty() )
m_log << " " << arg;
m_log << "\n";
m_indent += " ";
}
}
void closeLabel( const std::string& label, const std::string& arg = "" )
{
if( shouldRecord( label ) )
{
m_indent = m_indent.substr( 0, m_indent.size()-1 );
m_log << m_indent << "/" << label;
if( !arg.empty() )
m_log << " " << arg;
m_log << "\n";
}
}
std::string m_indent;
std::ostringstream m_log;
std::set<std::string> m_recorders;
};

4
projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj
View File

@@ -88,6 +88,8 @@
4AB1C73514F97BDA00F31DF7 /* catch_console_colour_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_console_colour_impl.hpp; sourceTree = "<group>"; };
4AB1C73714F97C1300F31DF7 /* catch_console_colour.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_console_colour.hpp; sourceTree = "<group>"; };
4AB77CB51551AEA200857BF0 /* catch_ptr.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_ptr.hpp; sourceTree = "<group>"; };
4AB77CB71553B72B00857BF0 /* catch_section_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_section_info.hpp; sourceTree = "<group>"; };
4AB77CB81553BB3800857BF0 /* catch_running_test.hpp */ = {isa = PBXFileReference; path = catch_running_test.hpp; sourceTree = "<group>"; };
4AE1840A14EE4F230066340D /* catch_self_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = catch_self_test.cpp; path = ../../../SelfTest/catch_self_test.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -197,6 +199,8 @@
4AB1C73714F97C1300F31DF7 /* catch_console_colour.hpp */,
4A3D7DD01503869D005F9203 /* catch_matchers.hpp */,
4AB77CB51551AEA200857BF0 /* catch_ptr.hpp */,
4AB77CB71553B72B00857BF0 /* catch_section_info.hpp */,
4AB77CB81553BB3800857BF0 /* catch_running_test.hpp */,
);
name = internal;
path = ../../../../include/internal;