diff options
| author | Martin Hořeňovský | 2022-03-06 19:20:53 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-03-08 12:51:13 +0100 |
| commit | 913f79a661a02be5791be9bdf2b8ee123579b51d (patch) | |
| tree | 10ea8909ab64d3dcece21da18514baa54594b435 /tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp | |
| parent | 06f74a0f8e505a08fff58e63beeb88569d8629d6 (diff) | |
| download | catch3-913f79a661a02be5791be9bdf2b8ee123579b51d.tar.gz | |
Each reporter keeps its own colour implementation
This opens path to per-reporter colour output customization,
and fixes multiple issues with the old colour implementation.
Under the old implementation, using Win32-backed colouring
would always change the colour used by the console, even if the
actual output was written elsewhere, such as a file passed by
the `--out` flag. This will no longer happen, as the reporter's
colour impl will check that the reporter's stream is pointed
to console before trying to change the colours.
POSIX/ANSI colour implementation suffered a similar-ish issue,
in that it only wrote the colour escape codes into the default
output stream, even if the reporter asking for colouring was
actually writing to a completely different output stream.
Diffstat (limited to 'tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp')
| -rw-r--r-- | tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp b/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp index a2416042..dcb186b6 100644 --- a/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp +++ b/tests/SelfTest/IntrospectiveTests/Reporters.tests.cpp @@ -13,6 +13,7 @@ #include <catch2/interfaces/catch_interfaces_reporter.hpp> #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp> #include <catch2/interfaces/catch_interfaces_reporter_registry.hpp> +#include <catch2/internal/catch_console_colour.hpp> #include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_list.hpp> #include <catch2/internal/catch_reporter_registry.hpp> @@ -40,11 +41,11 @@ TEST_CASE( "The default listing implementation write to provided stream", using Catch::Matchers::ContainsSubstring; using namespace std::string_literals; - std::stringstream sstream; + StringIStream sstream; SECTION( "Listing tags" ) { std::vector<Catch::TagInfo> tags(1); tags[0].add("fakeTag"_catch_sr); - Catch::defaultListTags(sstream, tags, false); + Catch::defaultListTags(sstream.stream(), tags, false); auto listingString = sstream.str(); REQUIRE_THAT(listingString, ContainsSubstring("[fakeTag]"s)); @@ -52,7 +53,7 @@ TEST_CASE( "The default listing implementation write to provided stream", SECTION( "Listing reporters" ) { std::vector<Catch::ReporterDescription> reporters( { { "fake reporter", "fake description" } } ); - Catch::defaultListReporters(sstream, reporters, Catch::Verbosity::Normal); + Catch::defaultListReporters(sstream.stream(), reporters, Catch::Verbosity::Normal); auto listingString = sstream.str(); REQUIRE_THAT(listingString, ContainsSubstring("fake reporter"s)); @@ -63,7 +64,11 @@ TEST_CASE( "The default listing implementation write to provided stream", { "fake test name"_catch_sr, "[fakeTestTag]"_catch_sr }, { "fake-file.cpp", 123456789 } }; std::vector<Catch::TestCaseHandle> tests({ {&fakeInfo, nullptr} }); - Catch::defaultListTests(sstream, tests, false, Catch::Verbosity::Normal); + Catch::ConfigData cd; + cd.useColour = Catch::UseColour::No; + Catch::Config conf(cd); + auto colour = Catch::makeColourImpl( &conf, &sstream); + Catch::defaultListTests(sstream.stream(), colour.get(), tests, false, Catch::Verbosity::Normal); auto listingString = sstream.str(); REQUIRE_THAT( listingString, |