diff options
| author | Phil Nash | 2016-02-24 18:51:01 +0000 |
|---|---|---|
| committer | Phil Nash | 2016-02-29 08:03:48 +0000 |
| commit | 8ccb18daa9c380c35ae4d13751e2a1aeed905815 (patch) | |
| tree | 5d96d80991cdfb35d8bd4d0880fb932b51a89874 /projects/SelfTest/TestMain.cpp | |
| parent | dce21544746dd73903eb13482775207662e161d4 (diff) | |
| download | catch3-8ccb18daa9c380c35ae4d13751e2a1aeed905815.tar.gz | |
Added --use-colour option to give finer control over colourisation.
--force-colour is still present but deprecated (will remove in v2)
Diffstat (limited to 'projects/SelfTest/TestMain.cpp')
| -rw-r--r-- | projects/SelfTest/TestMain.cpp | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp index 1713b51a..c63f469f 100644 --- a/projects/SelfTest/TestMain.cpp +++ b/projects/SelfTest/TestMain.cpp @@ -195,19 +195,41 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]" } } - SECTION( "force-colour", "") { - SECTION( "--force-colour", "" ) { - const char* argv[] = { "test", "--force-colour" }; + SECTION( "use-colour", "") { + + using Catch::UseColour; + + SECTION( "without option", "" ) { + const char* argv[] = { "test" }; CHECK_NOTHROW( parseIntoConfig( argv, config ) ); + + REQUIRE( config.useColour == UseColour::Auto ); + } - REQUIRE( config.forceColour ); + SECTION( "auto", "" ) { + const char* argv[] = { "test", "--use-colour", "auto" }; + CHECK_NOTHROW( parseIntoConfig( argv, config ) ); + + REQUIRE( config.useColour == UseColour::Auto ); } - SECTION( "without --force-colour", "" ) { - const char* argv[] = { "test" }; + SECTION( "yes", "" ) { + const char* argv[] = { "test", "--use-colour", "yes" }; CHECK_NOTHROW( parseIntoConfig( argv, config ) ); + + REQUIRE( config.useColour == UseColour::Yes ); + } + + SECTION( "no", "" ) { + const char* argv[] = { "test", "--use-colour", "no" }; + CHECK_NOTHROW( parseIntoConfig( argv, config ) ); + + REQUIRE( config.useColour == UseColour::No ); + } - REQUIRE( !config.forceColour ); + SECTION( "error", "" ) { + const char* argv[] = { "test", "--use-colour", "wrong" }; + REQUIRE_THROWS_WITH( parseIntoConfig( argv, config ), Contains( "colour mode must be one of" ) ); } } } |