3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-23 03:43:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make TestEventListenerBase register all verbosities

Browse Source 
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
This commit is contained in:
Martin Hořeňovský 2018-11-05 20:01:25 +01:00
parent de6bfb5c25
commit c51f2edfb1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/reporters/catch_reporter_bases.cpp
View File

@ -30,7 +30,7 @@ namespace Catch {
// + 1 for null terminator // + 1 for null terminator
const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1; const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
char buffer[maxDoubleSize]; char buffer[maxDoubleSize];
// Save previous errno, to prevent sprintf from overwriting it // Save previous errno, to prevent sprintf from overwriting it
ErrnoGuard guard; ErrnoGuard guard;
#ifdef _MSC_VER #ifdef _MSC_VER
@ -45,6 +45,10 @@ namespace Catch {
TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config) TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
:StreamingReporterBase(_config) {} :StreamingReporterBase(_config) {}
std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
}
void TestEventListenerBase::assertionStarting(AssertionInfo const &) {} void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
bool TestEventListenerBase::assertionEnded(AssertionStats const &) { bool TestEventListenerBase::assertionEnded(AssertionStats const &) {

4
include/reporters/catch_reporter_bases.hpp
View File

@ -217,7 +217,7 @@ namespace Catch {
node->children.push_back(m_rootSection); node->children.push_back(m_rootSection);
m_testCases.push_back(node); m_testCases.push_back(node);
m_rootSection.reset(); m_rootSection.reset();
assert(m_deepestSection); assert(m_deepestSection);
m_deepestSection->stdOut = testCaseStats.stdOut; m_deepestSection->stdOut = testCaseStats.stdOut;
m_deepestSection->stdErr = testCaseStats.stdErr; m_deepestSection->stdErr = testCaseStats.stdErr;
@ -266,6 +266,8 @@ namespace Catch {
struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> { struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
TestEventListenerBase( ReporterConfig const& _config ); TestEventListenerBase( ReporterConfig const& _config );
static std::set<Verbosity> getSupportedVerbosities();
void assertionStarting(AssertionInfo const&) override; void assertionStarting(AssertionInfo const&) override;
bool assertionEnded(AssertionStats const&) override; bool assertionEnded(AssertionStats const&) override;
}; };