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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-13 14:55:05 +0200
committerMartin Hořeňovský2022-04-13 15:02:25 +0200
commita243cbae52d5599ccce07b36cfe8b2e3308d4108 (patch)
tree9d18094f4bbfa4eef34bac5d4ea1bbce8a2a4936 /src/catch2
parent79d1e8238135427a6780a6db2cdb8b9be0b7f086 (diff)
downloadcatch3-a243cbae52d5599ccce07b36cfe8b2e3308d4108.tar.gz
Introduce type to handle reporter specs with defaults filled-in
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/catch_config.cpp35
-rw-r--r--src/catch2/catch_config.hpp21
-rw-r--r--src/catch2/catch_session.cpp25
3 files changed, 56 insertions, 25 deletions
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index 32d40410..79ec33f8 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -18,6 +18,14 @@
namespace Catch {
+ bool operator==( ProcessedReporterSpec const& lhs,
+ ProcessedReporterSpec const& rhs ) {
+ return lhs.name == rhs.name &&
+ lhs.outputFilename == rhs.outputFilename &&
+ lhs.colourMode == rhs.colourMode &&
+ lhs.customOptions == rhs.customOptions;
+ }
+
Config::Config( ConfigData const& data ):
m_data( data ) {
// We need to trim filter specs to avoid trouble with superfluous
@@ -80,25 +88,23 @@ namespace Catch {
// We now fixup the reporter specs to handle default output spec,
// default colour spec, etc
bool defaultOutputUsed = false;
- for ( auto& reporterSpec : m_data.reporterSpecifications ) {
+ for ( auto const& reporterSpec : m_data.reporterSpecifications ) {
+ // We do the default-output check separately, while always
+ // using the default output below to make the code simpler
+ // and avoid superfluous copies.
if ( reporterSpec.outputFile().none() ) {
CATCH_ENFORCE( !defaultOutputUsed,
"Internal error: cannot use default output for "
"multiple reporters" );
defaultOutputUsed = true;
-
- reporterSpec = ReporterSpec{ reporterSpec.name(),
- data.defaultOutputFilename,
- reporterSpec.colourMode(),
- reporterSpec.customOptions() };
}
- if ( reporterSpec.colourMode().none() ) {
- reporterSpec = ReporterSpec{ reporterSpec.name(),
- reporterSpec.outputFile(),
- data.defaultColourMode,
- reporterSpec.customOptions() };
- }
+ m_processedReporterSpecs.push_back( ProcessedReporterSpec{
+ reporterSpec.name(),
+ reporterSpec.outputFile() ? *reporterSpec.outputFile()
+ : data.defaultOutputFilename,
+ reporterSpec.colourMode().valueOr( data.defaultColourMode ),
+ reporterSpec.customOptions() } );
}
}
@@ -116,6 +122,11 @@ namespace Catch {
return m_data.reporterSpecifications;
}
+ std::vector<ProcessedReporterSpec> const&
+ Config::getProcessedReporterSpecs() const {
+ return m_processedReporterSpecs;
+ }
+
TestSpec const& Config::testSpec() const { return m_testSpec; }
bool Config::hasTestFilters() const { return m_hasTestFilters; }
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index b7f0c5b0..2b57bbb5 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -24,6 +24,24 @@ namespace Catch {
class IStream;
+ /**
+ * `ReporterSpec` but with the defaults filled in.
+ *
+ * Like `ReporterSpec`, the semantics are unchecked.
+ */
+ struct ProcessedReporterSpec {
+ std::string name;
+ std::string outputFilename;
+ ColourMode colourMode;
+ std::map<std::string, std::string> customOptions;
+ friend bool operator==( ProcessedReporterSpec const& lhs,
+ ProcessedReporterSpec const& rhs );
+ friend bool operator!=( ProcessedReporterSpec const& lhs,
+ ProcessedReporterSpec const& rhs ) {
+ return !( lhs == rhs );
+ }
+ };
+
struct ConfigData {
bool listTests = false;
@@ -81,6 +99,8 @@ namespace Catch {
bool listReporters() const;
std::vector<ReporterSpec> const& getReporterSpecs() const;
+ std::vector<ProcessedReporterSpec> const&
+ getProcessedReporterSpecs() const;
std::vector<std::string> const& getTestsOrTags() const override;
std::vector<std::string> const& getSectionsToRun() const override;
@@ -116,6 +136,7 @@ namespace Catch {
private:
ConfigData m_data;
+ std::vector<ProcessedReporterSpec> m_processedReporterSpecs;
TestSpec m_testSpec;
bool m_hasTestFilters = false;
};
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 048fd915..e6ad93a1 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -43,15 +43,14 @@ namespace Catch {
IEventListenerPtr prepareReporters(Config const* config) {
if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()
- && config->getReporterSpecs().size() == 1) {
- auto const& spec = config->getReporterSpecs()[0];
+ && config->getProcessedReporterSpecs().size() == 1) {
+ auto const& spec = config->getProcessedReporterSpecs()[0];
return createReporter(
- spec.name(),
- ReporterConfig(
- config,
- makeStream(*spec.outputFile()),
- *spec.colourMode(),
- spec.customOptions() ) );
+ spec.name,
+ ReporterConfig( config,
+ makeStream( spec.outputFilename ),
+ spec.colourMode,
+ spec.customOptions ) );
}
auto multi = Detail::make_unique<MultiReporter>(config);
@@ -62,13 +61,13 @@ namespace Catch {
}
std::size_t reporterIdx = 0;
- for (auto const& reporterSpec : config->getReporterSpecs()) {
+ for ( auto const& reporterSpec : config->getProcessedReporterSpecs() ) {
multi->addReporter( createReporter(
- reporterSpec.name(),
+ reporterSpec.name,
ReporterConfig( config,
- makeStream( *reporterSpec.outputFile() ),
- *reporterSpec.colourMode(),
- reporterSpec.customOptions() ) ) );
+ makeStream( reporterSpec.outputFilename ),
+ reporterSpec.colourMode,
+ reporterSpec.customOptions ) ) );
reporterIdx++;
}