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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-04 21:07:04 +0200
committerMartin Hořeňovský2022-04-07 12:50:08 +0200
commit423e1d2ebbd75bb92cb486f83f2c5800b4b9689e (patch)
tree3cfff7f75517b1771ab43c7439ba195a77dcec31 /src/catch2/internal
parent3c06bcb374aaebf91ad1d63aba655dee66cf7b91 (diff)
downloadcatch3-423e1d2ebbd75bb92cb486f83f2c5800b4b9689e.tar.gz
Integrate the new reporter specs into Catch2
This means that the CLI interface now uses the new key-value oriented reporter spec, the common reporter base creates the colour implementation based on the reporter-specific configuration, and it also stores the custom configuration options for each reporter instance. Closes #339 as it allows per-reporter forcing of ansi colour codes.
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_commandline.cpp61
1 files changed, 23 insertions, 38 deletions
diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp
index 5095f1db..0033a92f 100644
--- a/src/catch2/internal/catch_commandline.cpp
+++ b/src/catch2/internal/catch_commandline.cpp
@@ -141,57 +141,42 @@ namespace Catch {
return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + '\'' );
return ParserResult::ok( ParseResultType::Matched );
};
- auto const setReporter = [&]( std::string const& reporterSpec ) {
- if ( reporterSpec.empty() ) {
+ auto const setReporter = [&]( std::string const& userReporterSpec ) {
+ if ( userReporterSpec.empty() ) {
return ParserResult::runtimeError( "Received empty reporter spec." );
}
- // Exactly one of the reporters may be specified without an output
- // file, in which case it defaults to the output specified by "-o"
- // (or standard output).
- static constexpr auto separator = "::";
- static constexpr size_t separatorSize = 2;
- auto fileNameSeparatorPos = reporterSpec.find( separator );
- const bool containsFileName = fileNameSeparatorPos != reporterSpec.npos;
- if ( containsFileName ) {
- auto nextSeparatorPos = reporterSpec.find(
- separator, fileNameSeparatorPos + separatorSize );
- if ( nextSeparatorPos != reporterSpec.npos ) {
- return ParserResult::runtimeError(
- "Too many separators in reporter spec '" + reporterSpec + '\'' );
- }
+ Optional<ReporterSpec> parsed =
+ parseReporterSpec( userReporterSpec );
+ if ( !parsed ) {
+ return ParserResult::runtimeError(
+ "Could not parse reporter spec '" + userReporterSpec +
+ "'" );
}
- std::string reporterName;
- Optional<std::string> outputFileName;
- reporterName = reporterSpec.substr( 0, fileNameSeparatorPos );
- if ( reporterName.empty() ) {
- return ParserResult::runtimeError( "Reporter name cannot be empty." );
- }
-
- if ( containsFileName ) {
- outputFileName = reporterSpec.substr(
- fileNameSeparatorPos + separatorSize, reporterSpec.size() );
- }
+ auto const& reporterSpec = *parsed;
IReporterRegistry::FactoryMap const& factories =
getRegistryHub().getReporterRegistry().getFactories();
- auto result = factories.find( reporterName );
+ auto result = factories.find( reporterSpec.name() );
- if( result == factories.end() )
- return ParserResult::runtimeError( "Unrecognized reporter, '" + reporterName + "'. Check available with --list-reporters" );
- if( containsFileName && outputFileName->empty() )
- return ParserResult::runtimeError( "Reporter '" + reporterName + "' has empty filename specified as its output. Supply a filename or remove the colons to use the default output." );
+ if ( result == factories.end() ) {
+ return ParserResult::runtimeError(
+ "Unrecognized reporter, '" + reporterSpec.name() +
+ "'. Check available with --list-reporters" );
+ }
- config.reporterSpecifications.push_back({ std::move(reporterName), std::move(outputFileName) });
- // It would be enough to check this only once at the very end, but there is
- // not a place where we could call this check, so do it every time it could fail.
- // For valid inputs, this is still called at most once.
- if (!containsFileName) {
+ const bool hadOutputFile = reporterSpec.outputFile().some();
+ config.reporterSpecifications.push_back( CATCH_MOVE( *parsed ) );
+ // It would be enough to check this only once at the very end, but
+ // there is not a place where we could call this check, so do it
+ // every time it could fail. For valid inputs, this is still called
+ // at most once.
+ if (!hadOutputFile) {
int n_reporters_without_file = 0;
for (auto const& spec : config.reporterSpecifications) {
- if (spec.outputFileName.none()) {
+ if (spec.outputFile().none()) {
n_reporters_without_file++;
}
}