mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-04 21:29:54 +01:00
Cleanup ColourMode parsing in CLI
This commit is contained in:
parent
d750da13a8
commit
8ac86495de
@ -14,6 +14,7 @@
|
||||
#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
|
||||
#include <catch2/interfaces/catch_interfaces_reporter.hpp>
|
||||
#include <catch2/internal/catch_console_colour.hpp>
|
||||
#include <catch2/internal/catch_reporter_spec_parser.hpp>
|
||||
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
@ -98,40 +99,20 @@ namespace Catch {
|
||||
};
|
||||
auto const setColourMode = [&]( std::string const&
|
||||
colourMode ) {
|
||||
auto mode = toLower( colourMode );
|
||||
|
||||
if ( mode == "default" ) {
|
||||
if ( !isColourImplAvailable( ColourMode::PlatformDefault ) ) {
|
||||
return ParserResult::runtimeError(
|
||||
"colour mode 'default' is not supported in this "
|
||||
"binary" );
|
||||
}
|
||||
config.colourMode = ColourMode::PlatformDefault;
|
||||
} else if ( mode == "ansi" ) {
|
||||
if ( !isColourImplAvailable( ColourMode::ANSI ) ) {
|
||||
return ParserResult::runtimeError(
|
||||
"colour mode 'ansi' is not supported in this binary" );
|
||||
}
|
||||
config.colourMode = ColourMode::ANSI;
|
||||
} else if ( mode == "win32" ) {
|
||||
if ( !isColourImplAvailable( ColourMode::Win32 ) ) {
|
||||
return ParserResult::runtimeError(
|
||||
"colour mode 'win32' is not supported in this "
|
||||
"binary" );
|
||||
}
|
||||
config.colourMode = ColourMode::Win32;
|
||||
} else if ( mode == "none" ) {
|
||||
if ( !isColourImplAvailable( ColourMode::None ) ) {
|
||||
return ParserResult::runtimeError(
|
||||
"colour mode 'none' is not supported in this binary" );
|
||||
}
|
||||
config.colourMode = ColourMode::None;
|
||||
} else {
|
||||
Optional<ColourMode> maybeMode = Catch::Detail::stringToColourMode(toLower( colourMode ));
|
||||
if ( !maybeMode ) {
|
||||
return ParserResult::runtimeError(
|
||||
"colour mode must be one of: default, ansi, win32, "
|
||||
"or none. '" +
|
||||
colourMode + "' not recognised" );
|
||||
colourMode + "' is not recognised" );
|
||||
}
|
||||
auto mode = *maybeMode;
|
||||
if ( !isColourImplAvailable( mode ) ) {
|
||||
return ParserResult::runtimeError(
|
||||
"colour mode '" + colourMode +
|
||||
"' is not supported in this binary" );
|
||||
}
|
||||
config.colourMode = mode;
|
||||
return ParserResult::ok( ParseResultType::Matched );
|
||||
};
|
||||
auto const setWaitForKeypress = [&]( std::string const& keypress ) {
|
||||
|
@ -1407,7 +1407,7 @@ CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::ANSI f
|
||||
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: !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' not recognised" contains: "colour mode must be one of"
|
||||
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: {?}
|
||||
CmdLine.tests.cpp:<line number>: passed: config.benchmarkSamples == 200 for: 200 == 200
|
||||
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-resamples=20000" }) for: {?}
|
||||
|
@ -1405,7 +1405,7 @@ CmdLine.tests.cpp:<line number>: passed: config.colourMode == ColourMode::ANSI f
|
||||
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: !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' not recognised" contains: "colour mode must be one of"
|
||||
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: {?}
|
||||
CmdLine.tests.cpp:<line number>: passed: config.benchmarkSamples == 200 for: 200 == 200
|
||||
CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-resamples=20000" }) for: {?}
|
||||
|
@ -10124,7 +10124,7 @@ with expansion:
|
||||
CmdLine.tests.cpp:<line number>: PASSED:
|
||||
CHECK_THAT( result.errorMessage(), ContainsSubstring( "colour mode must be one of" ) )
|
||||
with expansion:
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' not
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' is not
|
||||
recognised" contains: "colour mode must be one of"
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
@ -10122,7 +10122,7 @@ with expansion:
|
||||
CmdLine.tests.cpp:<line number>: PASSED:
|
||||
CHECK_THAT( result.errorMessage(), ContainsSubstring( "colour mode must be one of" ) )
|
||||
with expansion:
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' not
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' is not
|
||||
recognised" contains: "colour mode must be one of"
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
@ -2629,7 +2629,7 @@ ok {test-number} - config.colourMode == 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
|
||||
ok {test-number} - result.errorMessage(), ContainsSubstring( "colour mode must be one of" ) for: "colour mode must be one of: default, ansi, win32, or none. 'wrong' not recognised" contains: "colour mode must be one of"
|
||||
ok {test-number} - 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"
|
||||
# Process can be configured on command line
|
||||
ok {test-number} - cli.parse({ "test", "--benchmark-samples=200" }) for: {?}
|
||||
# Process can be configured on command line
|
||||
|
@ -2627,7 +2627,7 @@ ok {test-number} - config.colourMode == 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
|
||||
ok {test-number} - result.errorMessage(), ContainsSubstring( "colour mode must be one of" ) for: "colour mode must be one of: default, ansi, win32, or none. 'wrong' not recognised" contains: "colour mode must be one of"
|
||||
ok {test-number} - 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"
|
||||
# Process can be configured on command line
|
||||
ok {test-number} - cli.parse({ "test", "--benchmark-samples=200" }) for: {?}
|
||||
# Process can be configured on command line
|
||||
|
@ -12337,7 +12337,7 @@ C
|
||||
result.errorMessage(), ContainsSubstring( "colour mode must be one of" )
|
||||
</Original>
|
||||
<Expanded>
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' not recognised" contains: "colour mode must be one of"
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' is not recognised" contains: "colour mode must be one of"
|
||||
</Expanded>
|
||||
</Expression>
|
||||
<OverallResults successes="2" failures="0" expectedFailures="0"/>
|
||||
|
@ -12337,7 +12337,7 @@ C
|
||||
result.errorMessage(), ContainsSubstring( "colour mode must be one of" )
|
||||
</Original>
|
||||
<Expanded>
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' not recognised" contains: "colour mode must be one of"
|
||||
"colour mode must be one of: default, ansi, win32, or none. 'wrong' is not recognised" contains: "colour mode must be one of"
|
||||
</Expanded>
|
||||
</Expression>
|
||||
<OverallResults successes="2" failures="0" expectedFailures="0"/>
|
||||
|
Loading…
Reference in New Issue
Block a user