mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 20:27:11 +01:00 
			
		
		
		
	Cleanup ColourMode parsing in CLI
This commit is contained in:
		| @@ -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"/> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský