diff options
| author | Martin Hořeňovský | 2021-11-07 23:31:44 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2021-11-09 11:50:03 +0100 |
| commit | 8780425385787242092333d72e30b2217cb2f6b3 (patch) | |
| tree | df69ea71c89b4ae1808d3be1e4dbfe314e06f1df /src/catch2 | |
| parent | 7800fe970864199aa6c064aa49baa5fb3463a817 (diff) | |
| download | catch3-8780425385787242092333d72e30b2217cb2f6b3.tar.gz | |
Make reporter lookup case insensitive, registration case preserving
Previously registration was case preserving, but lookup used
lowercased reporter name, so a reporter whose name contained
upper case character could not be requested by the user.
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/interfaces/catch_interfaces_combined_tu.cpp | 13 | ||||
| -rw-r--r-- | src/catch2/interfaces/catch_interfaces_reporter_registry.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/internal/catch_commandline.cpp | 5 |
3 files changed, 20 insertions, 4 deletions
diff --git a/src/catch2/interfaces/catch_interfaces_combined_tu.cpp b/src/catch2/interfaces/catch_interfaces_combined_tu.cpp index 7acf0a12..0f2f406b 100644 --- a/src/catch2/interfaces/catch_interfaces_combined_tu.cpp +++ b/src/catch2/interfaces/catch_interfaces_combined_tu.cpp @@ -76,8 +76,21 @@ namespace Catch { #include <catch2/interfaces/catch_interfaces_reporter_registry.hpp> +#include <catch2/internal/catch_string_manip.hpp> + +#include <algorithm> + namespace Catch { + IReporterRegistry::~IReporterRegistry() = default; + bool IReporterRegistry::CaseInsensitiveCmp::operator()(std::string const& lhs, std::string const& rhs) const { + return std::lexicographical_compare(lhs.begin(), lhs.end(), + rhs.begin(), rhs.end(), + [](char l, char r) { + return toLower(l) < toLower(r); + }); + } + } diff --git a/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp b/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp index 54871cce..0228f9c3 100644 --- a/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp +++ b/src/catch2/interfaces/catch_interfaces_reporter_registry.hpp @@ -24,7 +24,11 @@ namespace Catch { using IReporterFactoryPtr = Detail::unique_ptr<IReporterFactory>; struct IReporterRegistry { - using FactoryMap = std::map<std::string, IReporterFactoryPtr>; + struct CaseInsensitiveCmp { + bool operator()(std::string const& lhs, std::string const& rhs) const; + }; + + using FactoryMap = std::map<std::string, IReporterFactoryPtr, CaseInsensitiveCmp>; using Listeners = std::vector<IReporterFactoryPtr>; virtual ~IReporterRegistry(); // = default diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp index 6cf71b77..02056da5 100644 --- a/src/catch2/internal/catch_commandline.cpp +++ b/src/catch2/internal/catch_commandline.cpp @@ -140,11 +140,10 @@ namespace Catch { auto const setReporter = [&]( std::string const& reporter ) { IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories(); - auto lcReporter = toLower( reporter ); - auto result = factories.find( lcReporter ); + auto result = factories.find( reporter ); if( factories.end() != result ) - config.reporterName = lcReporter; + config.reporterName = reporter; else return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" ); return ParserResult::ok( ParseResultType::Matched ); |