From c51f2edfb1c81d2fd53605c0432820b3a329fe1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Mon, 5 Nov 2018 20:01:25 +0100 Subject: [PATCH] Make TestEventListenerBase register all verbosities This is a temporarily workaround until we can nuke the current verbosities system from the orbit and replace it with something actually sane. Fixes #1426 --- include/reporters/catch_reporter_bases.cpp | 6 +++++- include/reporters/catch_reporter_bases.hpp | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/reporters/catch_reporter_bases.cpp b/include/reporters/catch_reporter_bases.cpp index 4dd4f95d..fa441ee5 100644 --- a/include/reporters/catch_reporter_bases.cpp +++ b/include/reporters/catch_reporter_bases.cpp @@ -30,7 +30,7 @@ namespace Catch { // + 1 for null terminator const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1; char buffer[maxDoubleSize]; - + // Save previous errno, to prevent sprintf from overwriting it ErrnoGuard guard; #ifdef _MSC_VER @@ -45,6 +45,10 @@ namespace Catch { TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config) :StreamingReporterBase(_config) {} + std::set TestEventListenerBase::getSupportedVerbosities() { + return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High }; + } + void TestEventListenerBase::assertionStarting(AssertionInfo const &) {} bool TestEventListenerBase::assertionEnded(AssertionStats const &) { diff --git a/include/reporters/catch_reporter_bases.hpp b/include/reporters/catch_reporter_bases.hpp index ae1618fe..4a27db68 100644 --- a/include/reporters/catch_reporter_bases.hpp +++ b/include/reporters/catch_reporter_bases.hpp @@ -217,7 +217,7 @@ namespace Catch { node->children.push_back(m_rootSection); m_testCases.push_back(node); m_rootSection.reset(); - + assert(m_deepestSection); m_deepestSection->stdOut = testCaseStats.stdOut; m_deepestSection->stdErr = testCaseStats.stdErr; @@ -266,6 +266,8 @@ namespace Catch { struct TestEventListenerBase : StreamingReporterBase { TestEventListenerBase( ReporterConfig const& _config ); + static std::set getSupportedVerbosities(); + void assertionStarting(AssertionInfo const&) override; bool assertionEnded(AssertionStats const&) override; };