Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/tests/SelfTest
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-06 21:56:29 +0200
committerMartin Hořeňovský2022-04-07 12:50:13 +0200
commitd5bfce4d84f5dda55e1b77d2002a2726732130c6 (patch)
tree559b58fb3ec9b096af5e6f97f22ecc9f1588c49a /tests/SelfTest
parentc43947eb473d19dc183cd55ed0a4f7b06155342e (diff)
downloadcatch3-d5bfce4d84f5dda55e1b77d2002a2726732130c6.tar.gz
Rename config::colourMode to config::defaultConfigMode
This describes the actual intention much better.
Diffstat (limited to 'tests/SelfTest')
-rw-r--r--tests/SelfTest/Baselines/compact.sw.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/compact.sw.multi.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/console.sw.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/console.sw.multi.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/tap.sw.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/tap.sw.multi.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/xml.sw.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/xml.sw.multi.approved.txt8
-rw-r--r--tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp8
9 files changed, 36 insertions, 36 deletions
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index cabb1733..96fb47ce 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -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: {?}
diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index 2b8e2731..c1ac5044 100644
--- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -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: {?}
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 4ae9ebcc..938e96b0 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -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
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 356457f3..dea69f25 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -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
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index 3bbb1b25..6c38f276 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -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
diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index 70327011..35777386 100644
--- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
@@ -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
diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt
index a491eb75..d2710bd3 100644
--- a/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -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
diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
index 66006e48..085a5cad 100644
--- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
@@ -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
diff --git a/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
index 7599adbe..30cc3a0d 100644
--- a/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
+++ b/tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
@@ -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" ) {