3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 21:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename config::colourMode to config::defaultConfigMode

Browse Source 
This describes the actual intention much better.
This commit is contained in:
Martin Hořeňovský
2022-04-06 21:56:29 +02:00
parent c43947eb47
commit d5bfce4d84
14 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/SelfTest/Baselines/compact.sw.approved.txt
View File

@@ -1381,13 +1381,13 @@ CmdLine.tests.cpp:<line number>: passed: config.abortAfter == 1 for: 1 == 1
CmdLine.tests.cpp:<line number>: passed: config.shouldDebugBreak for: true
CmdLine.tests.cpp:<line number>: passed: config.noThrow == true for: true == true
CmdLine.tests.cpp:<line number>: passed: cli.parse({"test"}) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: cli.parse( { "test", "--colour-mode", "default" } ) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: cli.parse({"test", "--colour-mode", "ansi"}) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::ANSI for: 1 == 1
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::ANSI for: 1 == 1
CmdLine.tests.cpp:<line number>: passed: cli.parse({"test", "--colour-mode", "none"}) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::None for: 3 == 3
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::None for: 3 == 3
CmdLine.tests.cpp:<line number>: passed: !result for: true
CmdLine.tests.cpp:<line number>: passed: result.errorMessage(), ContainsSubstring( "colour mode must be one of" ) for: "colour mode must be one of: default, ansi, win32, or none. 'wrong' is not recognised" contains: "colour mode must be one of"
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-samples=200" }) for: {?}

8
tests/SelfTest/Baselines/compact.sw.multi.approved.txt
View File

@@ -1379,13 +1379,13 @@ CmdLine.tests.cpp:<line number>: passed: config.abortAfter == 1 for: 1 == 1
CmdLine.tests.cpp:<line number>: passed: config.shouldDebugBreak for: true
CmdLine.tests.cpp:<line number>: passed: config.noThrow == true for: true == true
CmdLine.tests.cpp:<line number>: passed: cli.parse({"test"}) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: cli.parse( { "test", "--colour-mode", "default" } ) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
CmdLine.tests.cpp:<line number>: passed: cli.parse({"test", "--colour-mode", "ansi"}) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::ANSI for: 1 == 1
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::ANSI for: 1 == 1
CmdLine.tests.cpp:<line number>: passed: cli.parse({"test", "--colour-mode", "none"}) for: {?}
CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::None for: 3 == 3
CmdLine.tests.cpp:<line number>: passed: config.defaultColourMode == ColourMode::None for: 3 == 3
CmdLine.tests.cpp:<line number>: passed: !result for: true
CmdLine.tests.cpp:<line number>: passed: result.errorMessage(), ContainsSubstring( "colour mode must be one of" ) for: "colour mode must be one of: default, ansi, win32, or none. 'wrong' is not recognised" contains: "colour mode must be one of"
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-samples=200" }) for: {?}

8
tests/SelfTest/Baselines/console.sw.approved.txt
View File

@@ -10014,7 +10014,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::PlatformDefault )
REQUIRE( config.defaultColourMode == ColourMode::PlatformDefault )
with expansion:
0 == 0
@@ -10032,7 +10032,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::PlatformDefault )
REQUIRE( config.defaultColourMode == ColourMode::PlatformDefault )
with expansion:
0 == 0
@@ -10050,7 +10050,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::ANSI )
REQUIRE( config.defaultColourMode == ColourMode::ANSI )
with expansion:
1 == 1
@@ -10068,7 +10068,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::None )
REQUIRE( config.defaultColourMode == ColourMode::None )
with expansion:
3 == 3

8
tests/SelfTest/Baselines/console.sw.multi.approved.txt
View File

@@ -10012,7 +10012,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::PlatformDefault )
REQUIRE( config.defaultColourMode == ColourMode::PlatformDefault )
with expansion:
0 == 0
@@ -10030,7 +10030,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::PlatformDefault )
REQUIRE( config.defaultColourMode == ColourMode::PlatformDefault )
with expansion:
0 == 0
@@ -10048,7 +10048,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::ANSI )
REQUIRE( config.defaultColourMode == ColourMode::ANSI )
with expansion:
1 == 1
@@ -10066,7 +10066,7 @@ with expansion:
{?}
CmdLine.tests.cpp:<line number>: PASSED:
REQUIRE( config.colourMode == ColourMode::None )
REQUIRE( config.defaultColourMode == ColourMode::None )
with expansion:
3 == 3

8
tests/SelfTest/Baselines/tap.sw.approved.txt
View File

@@ -2609,19 +2609,19 @@ ok {test-number} - config.noThrow == true for: true == true
# Process can be configured on command line
ok {test-number} - cli.parse({"test"}) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::PlatformDefault for: 0 == 0
ok {test-number} - config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
# Process can be configured on command line
ok {test-number} - cli.parse( { "test", "--colour-mode", "default" } ) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::PlatformDefault for: 0 == 0
ok {test-number} - config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
# Process can be configured on command line
ok {test-number} - cli.parse({"test", "--colour-mode", "ansi"}) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::ANSI for: 1 == 1
ok {test-number} - config.defaultColourMode == ColourMode::ANSI for: 1 == 1
# Process can be configured on command line
ok {test-number} - cli.parse({"test", "--colour-mode", "none"}) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::None for: 3 == 3
ok {test-number} - config.defaultColourMode == ColourMode::None for: 3 == 3
# Process can be configured on command line
ok {test-number} - !result for: true
# Process can be configured on command line

8
tests/SelfTest/Baselines/tap.sw.multi.approved.txt
View File

@@ -2607,19 +2607,19 @@ ok {test-number} - config.noThrow == true for: true == true
# Process can be configured on command line
ok {test-number} - cli.parse({"test"}) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::PlatformDefault for: 0 == 0
ok {test-number} - config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
# Process can be configured on command line
ok {test-number} - cli.parse( { "test", "--colour-mode", "default" } ) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::PlatformDefault for: 0 == 0
ok {test-number} - config.defaultColourMode == ColourMode::PlatformDefault for: 0 == 0
# Process can be configured on command line
ok {test-number} - cli.parse({"test", "--colour-mode", "ansi"}) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::ANSI for: 1 == 1
ok {test-number} - config.defaultColourMode == ColourMode::ANSI for: 1 == 1
# Process can be configured on command line
ok {test-number} - cli.parse({"test", "--colour-mode", "none"}) for: {?}
# Process can be configured on command line
ok {test-number} - config.colourMode == ColourMode::None for: 3 == 3
ok {test-number} - config.defaultColourMode == ColourMode::None for: 3 == 3
# Process can be configured on command line
ok {test-number} - !result for: true
# Process can be configured on command line

8
tests/SelfTest/Baselines/xml.sw.approved.txt
View File

@@ -12208,7 +12208,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::PlatformDefault
config.defaultColourMode == ColourMode::PlatformDefault
</Original>
<Expanded>
0 == 0
@@ -12230,7 +12230,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::PlatformDefault
config.defaultColourMode == ColourMode::PlatformDefault
</Original>
<Expanded>
0 == 0
@@ -12252,7 +12252,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::ANSI
config.defaultColourMode == ColourMode::ANSI
</Original>
<Expanded>
1 == 1
@@ -12274,7 +12274,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::None
config.defaultColourMode == ColourMode::None
</Original>
<Expanded>
3 == 3

8
tests/SelfTest/Baselines/xml.sw.multi.approved.txt
View File

@@ -12208,7 +12208,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::PlatformDefault
config.defaultColourMode == ColourMode::PlatformDefault
</Original>
<Expanded>
0 == 0
@@ -12230,7 +12230,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::PlatformDefault
config.defaultColourMode == ColourMode::PlatformDefault
</Original>
<Expanded>
0 == 0
@@ -12252,7 +12252,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::ANSI
config.defaultColourMode == ColourMode::ANSI
</Original>
<Expanded>
1 == 1
@@ -12274,7 +12274,7 @@ C
</Expression>
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
<Original>
config.colourMode == ColourMode::None
config.defaultColourMode == ColourMode::None
</Original>
<Expanded>
3 == 3

8
tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
View File

@@ -566,25 +566,25 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
SECTION( "without option" ) {
CHECK(cli.parse({"test"}));
REQUIRE( config.colourMode == ColourMode::PlatformDefault );
REQUIRE( config.defaultColourMode == ColourMode::PlatformDefault );
}
SECTION( "auto" ) {
CHECK( cli.parse( { "test", "--colour-mode", "default" } ) );
REQUIRE( config.colourMode == ColourMode::PlatformDefault );
REQUIRE( config.defaultColourMode == ColourMode::PlatformDefault );
}
SECTION( "yes" ) {
CHECK(cli.parse({"test", "--colour-mode", "ansi"}));
REQUIRE( config.colourMode == ColourMode::ANSI );
REQUIRE( config.defaultColourMode == ColourMode::ANSI );
}
SECTION( "no" ) {
CHECK(cli.parse({"test", "--colour-mode", "none"}));
REQUIRE( config.colourMode == ColourMode::None );
REQUIRE( config.defaultColourMode == ColourMode::None );
}
SECTION( "error" ) {