3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-23 05:46:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Config refactoring: split List enum into three bools

Browse Source
This commit is contained in:
Phil Nash 2013-05-29 18:42:46 +01:00
parent 3c3beb57c3
commit c2ca80d9fb
4 changed files with 90 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/internal/catch_commandline.hpp
View File

@ -317,7 +317,7 @@ namespace Catch {
class ListOptionParser : public OptionParser { class ListOptionParser : public OptionParser {
public: public:
ListOptionParser() : OptionParser( 0, 2 ) { ListOptionParser() : OptionParser( 0, 1 ) {
m_optionNames.push_back( "-l" ); m_optionNames.push_back( "-l" );
m_optionNames.push_back( "--list" ); m_optionNames.push_back( "--list" );
} }
@ -346,27 +346,21 @@ namespace Catch {
} }
virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) { virtual void parseIntoConfig( Command const& cmd, ConfigData& config ) {
config.listSpec = List::Tests;
if( cmd.argsCount() >= 1 ) { if( cmd.argsCount() >= 1 ) {
if( cmd[0] == "all" ) if( cmd[0] == "all" ) {
config.listSpec = List::All; config.listTests = true;
config.listTags = true;
config.listReporters = true;
}
else if( cmd[0] == "tests" ) else if( cmd[0] == "tests" )
config.listSpec = List::Tests; config.listTests = true;
else if( cmd[0] == "tags" ) else if( cmd[0] == "tags" )
config.listSpec = List::Tags; config.listTags = true;
else if( cmd[0] == "reporters" ) else if( cmd[0] == "reporters" )
config.listSpec = List::Reports; config.listReporters = true;
else else
cmd.raiseError( "Expected tests, reporters or tags" ); cmd.raiseError( "Expected tests, reporters or tags" );
} }
if( cmd.argsCount() >= 2 ) {
if( cmd[1] == "xml" )
config.listSpec = static_cast<List::What>( config.listSpec | List::AsXml );
else if( cmd[1] == "text" )
config.listSpec = static_cast<List::What>( config.listSpec | List::AsText );
else
cmd.raiseError( "Expected xml or text" );
}
} }
}; };

36
include/internal/catch_config.hpp
View File

@ -24,27 +24,6 @@
namespace Catch { namespace Catch {
struct Include { enum WhichResults {
FailedOnly,
SuccessfulResults
}; };
struct List{ enum What {
None = 0,
Reports = 1,
Tests = 2,
Tags = 4,
All = Reports | Tests | Tags,
WhatMask = 0xf,
AsText = 0x10,
AsXml = 0x20,
AsMask = 0xf0
}; };
struct ConfigData { struct ConfigData {
struct Verbosity { enum Level { struct Verbosity { enum Level {
@ -52,13 +31,16 @@ namespace Catch {
Quiet, Quiet,
Normal Normal
}; }; }; };
struct WarnAbout { enum What { struct WarnAbout { enum What {
Nothing = 0x00, Nothing = 0x00,
NoAssertions = 0x01 NoAssertions = 0x01
}; }; }; };
ConfigData() ConfigData()
: listSpec( List::None ), : listTests( false ),
listTags( false ),
listReporters( false ),
showSuccessfulTests( false ), showSuccessfulTests( false ),
shouldDebugBreak( false ), shouldDebugBreak( false ),
noThrow( false ), noThrow( false ),
@ -66,7 +48,9 @@ namespace Catch {
warnings( WarnAbout::Nothing ) warnings( WarnAbout::Nothing )
{} {}
List::What listSpec; // !TBD Split into bools bool listTests;
bool listTags;
bool listReporters;
bool showSuccessfulTests; bool showSuccessfulTests;
bool shouldDebugBreak; bool shouldDebugBreak;
bool noThrow; bool noThrow;
@ -117,9 +101,9 @@ namespace Catch {
return m_data.outputFilename ; return m_data.outputFilename ;
} }
bool listTests() const { return m_data.listSpec & List::Tests; } bool listTests() const { return m_data.listTests; }
bool listTags() const { return m_data.listSpec & List::Tags; } bool listTags() const { return m_data.listTags; }
bool listReporters() const { return m_data.listSpec & List::Reports; } bool listReporters() const { return m_data.listReporters; }
std::string getName() const { std::string getName() const {
return m_data.name; return m_data.name;

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

@ -5762,7 +5762,7 @@ Scenario: New Catch commandline interface
When: We ask for usage strings When: We ask for usage strings
Then: It prints the usage strings Then: It prints the usage strings
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:323 CmdLineTests.cpp:324
............................................................................... ...............................................................................
@ -5773,22 +5773,22 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: Multiple flags are combined When: Multiple flags are combined
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:328 CmdLineTests.cpp:329
............................................................................... ...............................................................................
CmdLineTests.cpp:330: CmdLineTests.cpp:331:
PASSED: PASSED:
CHECK_FALSE( config.showSuccessfulTests ) CHECK_FALSE( config.showSuccessfulTests )
with expansion: with expansion:
!false !false
CmdLineTests.cpp:331: CmdLineTests.cpp:332:
PASSED: PASSED:
CHECK_FALSE( config.noThrow ) CHECK_FALSE( config.noThrow )
with expansion: with expansion:
!false !false
CmdLineTests.cpp:332: CmdLineTests.cpp:333:
PASSED: PASSED:
CHECK_FALSE( config.breakIntoDebugger ) CHECK_FALSE( config.breakIntoDebugger )
with expansion: with expansion:
@ -5800,22 +5800,22 @@ Scenario: New Catch commandline interface
When: Multiple flags are combined When: Multiple flags are combined
Then: All the flags are set Then: All the flags are set
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:337 CmdLineTests.cpp:338
............................................................................... ...............................................................................
CmdLineTests.cpp:338: CmdLineTests.cpp:339:
PASSED: PASSED:
CHECK( config.showSuccessfulTests ) CHECK( config.showSuccessfulTests )
with expansion: with expansion:
true true
CmdLineTests.cpp:339: CmdLineTests.cpp:340:
PASSED: PASSED:
CHECK( config.noThrow ) CHECK( config.noThrow )
with expansion: with expansion:
true true
CmdLineTests.cpp:340: CmdLineTests.cpp:341:
PASSED: PASSED:
CHECK( config.breakIntoDebugger ) CHECK( config.breakIntoDebugger )
with expansion: with expansion:
@ -5826,22 +5826,22 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: Multiple flags are combined When: Multiple flags are combined
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:328 CmdLineTests.cpp:329
............................................................................... ...............................................................................
CmdLineTests.cpp:330: CmdLineTests.cpp:331:
PASSED: PASSED:
CHECK_FALSE( config.showSuccessfulTests ) CHECK_FALSE( config.showSuccessfulTests )
with expansion: with expansion:
!false !false
CmdLineTests.cpp:331: CmdLineTests.cpp:332:
PASSED: PASSED:
CHECK_FALSE( config.noThrow ) CHECK_FALSE( config.noThrow )
with expansion: with expansion:
!false !false
CmdLineTests.cpp:332: CmdLineTests.cpp:333:
PASSED: PASSED:
CHECK_FALSE( config.breakIntoDebugger ) CHECK_FALSE( config.breakIntoDebugger )
with expansion: with expansion:
@ -5852,10 +5852,10 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: A flag is set via a nullary method When: A flag is set via a nullary method
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:343 CmdLineTests.cpp:344
............................................................................... ...............................................................................
CmdLineTests.cpp:344: CmdLineTests.cpp:345:
PASSED: PASSED:
CHECK( config.abortAfter == 0 ) CHECK( config.abortAfter == 0 )
with expansion: with expansion:
@ -5867,10 +5867,10 @@ Scenario: New Catch commandline interface
When: A flag is set via a nullary method When: A flag is set via a nullary method
Then: The flag is set Then: The flag is set
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:349 CmdLineTests.cpp:350
............................................................................... ...............................................................................
CmdLineTests.cpp:350: CmdLineTests.cpp:351:
PASSED: PASSED:
REQUIRE( config.abortAfter == 1 ) REQUIRE( config.abortAfter == 1 )
with expansion: with expansion:
@ -5881,10 +5881,10 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: A flag is set via a nullary method When: A flag is set via a nullary method
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:343 CmdLineTests.cpp:344
............................................................................... ...............................................................................
CmdLineTests.cpp:344: CmdLineTests.cpp:345:
PASSED: PASSED:
CHECK( config.abortAfter == 0 ) CHECK( config.abortAfter == 0 )
with expansion: with expansion:
@ -5895,10 +5895,10 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: A flag is set via a unary method When: A flag is set via a unary method
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:352 CmdLineTests.cpp:353
............................................................................... ...............................................................................
CmdLineTests.cpp:353: CmdLineTests.cpp:354:
PASSED: PASSED:
CHECK( config.abortAfter == 0 ) CHECK( config.abortAfter == 0 )
with expansion: with expansion:
@ -5910,10 +5910,10 @@ Scenario: New Catch commandline interface
When: A flag is set via a unary method When: A flag is set via a unary method
Then: The flag is set Then: The flag is set
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:358 CmdLineTests.cpp:359
............................................................................... ...............................................................................
CmdLineTests.cpp:359: CmdLineTests.cpp:360:
PASSED: PASSED:
REQUIRE( config.abortAfter == 2 ) REQUIRE( config.abortAfter == 2 )
with expansion: with expansion:
@ -5924,10 +5924,10 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: A flag is set via a unary method When: A flag is set via a unary method
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:352 CmdLineTests.cpp:353
............................................................................... ...............................................................................
CmdLineTests.cpp:353: CmdLineTests.cpp:354:
PASSED: PASSED:
CHECK( config.abortAfter == 0 ) CHECK( config.abortAfter == 0 )
with expansion: with expansion:
@ -5939,16 +5939,16 @@ Scenario: New Catch commandline interface
When: A positional argument is supplied When: A positional argument is supplied
Then: The argument is in the testOrTags collection Then: The argument is in the testOrTags collection
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:366 CmdLineTests.cpp:367
............................................................................... ...............................................................................
CmdLineTests.cpp:367: CmdLineTests.cpp:368:
PASSED: PASSED:
REQUIRE( config.testsOrTags.size() == 1 ) REQUIRE( config.testsOrTags.size() == 1 )
with expansion: with expansion:
1 == 1 1 == 1
CmdLineTests.cpp:368: CmdLineTests.cpp:369:
PASSED: PASSED:
REQUIRE( config.testsOrTags[0] == "[hello]" ) REQUIRE( config.testsOrTags[0] == "[hello]" )
with expansion: with expansion:
@ -5959,10 +5959,10 @@ Scenario: New Catch commandline interface
Given: A built cli parser for Catch Given: A built cli parser for Catch
When: And enum opt is set by numeric value When: And enum opt is set by numeric value
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:371 CmdLineTests.cpp:372
............................................................................... ...............................................................................
CmdLineTests.cpp:372: CmdLineTests.cpp:373:
PASSED: PASSED:
CHECK( config.verbosity == Config::Verbosity::Normal ) CHECK( config.verbosity == Config::Verbosity::Normal )
with expansion: with expansion:
@ -5974,10 +5974,10 @@ Scenario: New Catch commandline interface
When: And enum opt is set by numeric value When: And enum opt is set by numeric value
Then: The member is set to the enum value Then: The member is set to the enum value
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
CmdLineTests.cpp:377 CmdLineTests.cpp:378
............................................................................... ...............................................................................
CmdLineTests.cpp:378: CmdLineTests.cpp:379:
PASSED: PASSED:
REQUIRE( config.verbosity == Config::Verbosity::NoOutput ) REQUIRE( config.verbosity == Config::Verbosity::NoOutput )
with expansion: with expansion:
@ -13012,7 +13012,7 @@ CmdLineTests.cpp" line="179">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: Multiple flags are combined"> <Section name=" When: Multiple flags are combined">
CmdLineTests.cpp" line="330"> CmdLineTests.cpp" line="331">
<Original> <Original>
!config.showSuccessfulTests !config.showSuccessfulTests
</Original> </Original>
@ -13020,7 +13020,7 @@ CmdLineTests.cpp" line="330">
!false !false
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="331"> CmdLineTests.cpp" line="332">
<Original> <Original>
!config.noThrow !config.noThrow
</Original> </Original>
@ -13028,7 +13028,7 @@ CmdLineTests.cpp" line="331">
!false !false
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="332"> CmdLineTests.cpp" line="333">
<Original> <Original>
!config.breakIntoDebugger !config.breakIntoDebugger
</Original> </Original>
@ -13037,7 +13037,7 @@ CmdLineTests.cpp" line="332">
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" Then: All the flags are set"> <Section name=" Then: All the flags are set">
CmdLineTests.cpp" line="338"> CmdLineTests.cpp" line="339">
<Original> <Original>
config.showSuccessfulTests config.showSuccessfulTests
</Original> </Original>
@ -13045,7 +13045,7 @@ CmdLineTests.cpp" line="338">
true true
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="339"> CmdLineTests.cpp" line="340">
<Original> <Original>
config.noThrow config.noThrow
</Original> </Original>
@ -13053,7 +13053,7 @@ CmdLineTests.cpp" line="339">
true true
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="340"> CmdLineTests.cpp" line="341">
<Original> <Original>
config.breakIntoDebugger config.breakIntoDebugger
</Original> </Original>
@ -13069,7 +13069,7 @@ CmdLineTests.cpp" line="340">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: Multiple flags are combined"> <Section name=" When: Multiple flags are combined">
CmdLineTests.cpp" line="330"> CmdLineTests.cpp" line="331">
<Original> <Original>
!config.showSuccessfulTests !config.showSuccessfulTests
</Original> </Original>
@ -13077,7 +13077,7 @@ CmdLineTests.cpp" line="330">
!false !false
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="331"> CmdLineTests.cpp" line="332">
<Original> <Original>
!config.noThrow !config.noThrow
</Original> </Original>
@ -13085,7 +13085,7 @@ CmdLineTests.cpp" line="331">
!false !false
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="332"> CmdLineTests.cpp" line="333">
<Original> <Original>
!config.breakIntoDebugger !config.breakIntoDebugger
</Original> </Original>
@ -13099,7 +13099,7 @@ CmdLineTests.cpp" line="332">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: A flag is set via a nullary method"> <Section name=" When: A flag is set via a nullary method">
CmdLineTests.cpp" line="344"> CmdLineTests.cpp" line="345">
<Original> <Original>
config.abortAfter == 0 config.abortAfter == 0
</Original> </Original>
@ -13108,7 +13108,7 @@ CmdLineTests.cpp" line="344">
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" Then: The flag is set"> <Section name=" Then: The flag is set">
CmdLineTests.cpp" line="350"> CmdLineTests.cpp" line="351">
<Original> <Original>
config.abortAfter == 1 config.abortAfter == 1
</Original> </Original>
@ -13124,7 +13124,7 @@ CmdLineTests.cpp" line="350">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: A flag is set via a nullary method"> <Section name=" When: A flag is set via a nullary method">
CmdLineTests.cpp" line="344"> CmdLineTests.cpp" line="345">
<Original> <Original>
config.abortAfter == 0 config.abortAfter == 0
</Original> </Original>
@ -13138,7 +13138,7 @@ CmdLineTests.cpp" line="344">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: A flag is set via a unary method"> <Section name=" When: A flag is set via a unary method">
CmdLineTests.cpp" line="353"> CmdLineTests.cpp" line="354">
<Original> <Original>
config.abortAfter == 0 config.abortAfter == 0
</Original> </Original>
@ -13147,7 +13147,7 @@ CmdLineTests.cpp" line="353">
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" Then: The flag is set"> <Section name=" Then: The flag is set">
CmdLineTests.cpp" line="359"> CmdLineTests.cpp" line="360">
<Original> <Original>
config.abortAfter == 2 config.abortAfter == 2
</Original> </Original>
@ -13163,7 +13163,7 @@ CmdLineTests.cpp" line="359">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: A flag is set via a unary method"> <Section name=" When: A flag is set via a unary method">
CmdLineTests.cpp" line="353"> CmdLineTests.cpp" line="354">
<Original> <Original>
config.abortAfter == 0 config.abortAfter == 0
</Original> </Original>
@ -13178,7 +13178,7 @@ CmdLineTests.cpp" line="353">
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: A positional argument is supplied"> <Section name=" When: A positional argument is supplied">
<Section name=" Then: The argument is in the testOrTags collection"> <Section name=" Then: The argument is in the testOrTags collection">
CmdLineTests.cpp" line="367"> CmdLineTests.cpp" line="368">
<Original> <Original>
config.testsOrTags.size() == 1 config.testsOrTags.size() == 1
</Original> </Original>
@ -13186,7 +13186,7 @@ CmdLineTests.cpp" line="367">
1 == 1 1 == 1
</Expanded> </Expanded>
</Expression> </Expression>
CmdLineTests.cpp" line="368"> CmdLineTests.cpp" line="369">
<Original> <Original>
config.testsOrTags[0] == &quot;[hello]&quot; config.testsOrTags[0] == &quot;[hello]&quot;
</Original> </Original>
@ -13208,7 +13208,7 @@ CmdLineTests.cpp" line="368">
</Section> </Section>
<Section name=" Given: A built cli parser for Catch"> <Section name=" Given: A built cli parser for Catch">
<Section name=" When: And enum opt is set by numeric value"> <Section name=" When: And enum opt is set by numeric value">
CmdLineTests.cpp" line="372"> CmdLineTests.cpp" line="373">
<Original> <Original>
config.verbosity == Config::Verbosity::Normal config.verbosity == Config::Verbosity::Normal
</Original> </Original>
@ -13217,7 +13217,7 @@ CmdLineTests.cpp" line="372">
</Expanded> </Expanded>
</Expression> </Expression>
<Section name=" Then: The member is set to the enum value"> <Section name=" Then: The member is set to the enum value">
CmdLineTests.cpp" line="378"> CmdLineTests.cpp" line="379">
<Original> <Original>
config.verbosity == Config::Verbosity::NoOutput config.verbosity == Config::Verbosity::NoOutput
</Original> </Original>
@ -15192,13 +15192,13 @@ No assertions in section, ' Then: It prints the usage strings'
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: Multiple flags are combined'] [Started section: ' When: Multiple flags are combined']
CmdLineTests.cpp:330: !config.showSuccessfulTests succeeded for: !false CmdLineTests.cpp:331: !config.showSuccessfulTests succeeded for: !false
CmdLineTests.cpp:331: !config.noThrow succeeded for: !false CmdLineTests.cpp:332: !config.noThrow succeeded for: !false
CmdLineTests.cpp:332: !config.breakIntoDebugger succeeded for: !false CmdLineTests.cpp:333: !config.breakIntoDebugger succeeded for: !false
[Started section: ' Then: All the flags are set'] [Started section: ' Then: All the flags are set']
CmdLineTests.cpp:338: config.showSuccessfulTests succeeded for: true CmdLineTests.cpp:339: config.showSuccessfulTests succeeded for: true
CmdLineTests.cpp:339: config.noThrow succeeded for: true CmdLineTests.cpp:340: config.noThrow succeeded for: true
CmdLineTests.cpp:340: config.breakIntoDebugger succeeded for: true CmdLineTests.cpp:341: config.breakIntoDebugger succeeded for: true
[End of section: ' Then: All the flags are set' All 3 assertions passed] [End of section: ' Then: All the flags are set' All 3 assertions passed]
[End of section: ' When: Multiple flags are combined' All 6 assertions passed] [End of section: ' When: Multiple flags are combined' All 6 assertions passed]
@ -15207,18 +15207,18 @@ CmdLineTests.cpp:340: config.breakIntoDebugger succeeded for: true
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: Multiple flags are combined'] [Started section: ' When: Multiple flags are combined']
CmdLineTests.cpp:330: !config.showSuccessfulTests succeeded for: !false CmdLineTests.cpp:331: !config.showSuccessfulTests succeeded for: !false
CmdLineTests.cpp:331: !config.noThrow succeeded for: !false CmdLineTests.cpp:332: !config.noThrow succeeded for: !false
CmdLineTests.cpp:332: !config.breakIntoDebugger succeeded for: !false CmdLineTests.cpp:333: !config.breakIntoDebugger succeeded for: !false
[End of section: ' When: Multiple flags are combined' All 3 assertions passed] [End of section: ' When: Multiple flags are combined' All 3 assertions passed]
[End of section: ' Given: A built cli parser for Catch' All 3 assertions passed] [End of section: ' Given: A built cli parser for Catch' All 3 assertions passed]
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: A flag is set via a nullary method'] [Started section: ' When: A flag is set via a nullary method']
CmdLineTests.cpp:344: config.abortAfter == 0 succeeded for: 0 == 0 CmdLineTests.cpp:345: config.abortAfter == 0 succeeded for: 0 == 0
[Started section: ' Then: The flag is set'] [Started section: ' Then: The flag is set']
CmdLineTests.cpp:350: config.abortAfter == 1 succeeded for: 1 == 1 CmdLineTests.cpp:351: config.abortAfter == 1 succeeded for: 1 == 1
[End of section: ' Then: The flag is set' 1 assertion passed] [End of section: ' Then: The flag is set' 1 assertion passed]
[End of section: ' When: A flag is set via a nullary method' All 2 assertions passed] [End of section: ' When: A flag is set via a nullary method' All 2 assertions passed]
@ -15227,16 +15227,16 @@ CmdLineTests.cpp:350: config.abortAfter == 1 succeeded for: 1 == 1
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: A flag is set via a nullary method'] [Started section: ' When: A flag is set via a nullary method']
CmdLineTests.cpp:344: config.abortAfter == 0 succeeded for: 0 == 0 CmdLineTests.cpp:345: config.abortAfter == 0 succeeded for: 0 == 0
[End of section: ' When: A flag is set via a nullary method' 1 assertion passed] [End of section: ' When: A flag is set via a nullary method' 1 assertion passed]
[End of section: ' Given: A built cli parser for Catch' 1 assertion passed] [End of section: ' Given: A built cli parser for Catch' 1 assertion passed]
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: A flag is set via a unary method'] [Started section: ' When: A flag is set via a unary method']
CmdLineTests.cpp:353: config.abortAfter == 0 succeeded for: 0 == 0 CmdLineTests.cpp:354: config.abortAfter == 0 succeeded for: 0 == 0
[Started section: ' Then: The flag is set'] [Started section: ' Then: The flag is set']
CmdLineTests.cpp:359: config.abortAfter == 2 succeeded for: 2 == 2 CmdLineTests.cpp:360: config.abortAfter == 2 succeeded for: 2 == 2
[End of section: ' Then: The flag is set' 1 assertion passed] [End of section: ' Then: The flag is set' 1 assertion passed]
[End of section: ' When: A flag is set via a unary method' All 2 assertions passed] [End of section: ' When: A flag is set via a unary method' All 2 assertions passed]
@ -15245,7 +15245,7 @@ CmdLineTests.cpp:359: config.abortAfter == 2 succeeded for: 2 == 2
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: A flag is set via a unary method'] [Started section: ' When: A flag is set via a unary method']
CmdLineTests.cpp:353: config.abortAfter == 0 succeeded for: 0 == 0 CmdLineTests.cpp:354: config.abortAfter == 0 succeeded for: 0 == 0
[End of section: ' When: A flag is set via a unary method' 1 assertion passed] [End of section: ' When: A flag is set via a unary method' 1 assertion passed]
[End of section: ' Given: A built cli parser for Catch' 1 assertion passed] [End of section: ' Given: A built cli parser for Catch' 1 assertion passed]
@ -15253,8 +15253,8 @@ CmdLineTests.cpp:353: config.abortAfter == 0 succeeded for: 0 == 0
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: A positional argument is supplied'] [Started section: ' When: A positional argument is supplied']
[Started section: ' Then: The argument is in the testOrTags collection'] [Started section: ' Then: The argument is in the testOrTags collection']
CmdLineTests.cpp:367: config.testsOrTags.size() == 1 succeeded for: 1 == 1 CmdLineTests.cpp:368: config.testsOrTags.size() == 1 succeeded for: 1 == 1
CmdLineTests.cpp:368: config.testsOrTags[0] == "[hello]" succeeded for: "[hello]" == "[hello]" CmdLineTests.cpp:369: config.testsOrTags[0] == "[hello]" succeeded for: "[hello]" == "[hello]"
[End of section: ' Then: The argument is in the testOrTags collection' All 2 assertions passed] [End of section: ' Then: The argument is in the testOrTags collection' All 2 assertions passed]
[End of section: ' When: A positional argument is supplied' All 2 assertions passed] [End of section: ' When: A positional argument is supplied' All 2 assertions passed]
@ -15263,9 +15263,9 @@ CmdLineTests.cpp:368: config.testsOrTags[0] == "[hello]" succeeded for: "[hello]
[Started section: ' Given: A built cli parser for Catch'] [Started section: ' Given: A built cli parser for Catch']
[Started section: ' When: And enum opt is set by numeric value'] [Started section: ' When: And enum opt is set by numeric value']
CmdLineTests.cpp:372: config.verbosity == Config::Verbosity::Normal succeeded for: 2 == 2 CmdLineTests.cpp:373: config.verbosity == Config::Verbosity::Normal succeeded for: 2 == 2
[Started section: ' Then: The member is set to the enum value'] [Started section: ' Then: The member is set to the enum value']
CmdLineTests.cpp:378: config.verbosity == Config::Verbosity::NoOutput succeeded for: 0 == 0 CmdLineTests.cpp:379: config.verbosity == Config::Verbosity::NoOutput succeeded for: 0 == 0
[End of section: ' Then: The member is set to the enum value' 1 assertion passed] [End of section: ' Then: The member is set to the enum value' 1 assertion passed]
[End of section: ' When: And enum opt is set by numeric value' All 2 assertions passed] [End of section: ' When: And enum opt is set by numeric value' All 2 assertions passed]

1
projects/SelfTest/CmdLineTests.cpp
View File

@ -188,6 +188,7 @@ struct Config {
Config() Config()
: listTests( false ), : listTests( false ),
listTags( false ), listTags( false ),
listReporters( false ),
showSuccessfulTests( false ), showSuccessfulTests( false ),
breakIntoDebugger( false ), breakIntoDebugger( false ),
noThrow( false ), noThrow( false ),