mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
Merged Martin Moene’s “compact reporter”
This commit is contained in:
Phil Nash
parent
9f1e054a42
commit
c02c7003dc
@ -39,6 +39,7 @@
|
|||||||
#include "../reporters/catch_reporter_xml.hpp"
|
#include "../reporters/catch_reporter_xml.hpp"
|
||||||
#include "../reporters/catch_reporter_junit.hpp"
|
#include "../reporters/catch_reporter_junit.hpp"
|
||||||
#include "../reporters/catch_reporter_console.hpp"
|
#include "../reporters/catch_reporter_console.hpp"
|
||||||
|
#include "../reporters/catch_reporter_compact.hpp"
|
||||||
|
|
||||||
namespace Catch {
|
namespace Catch {
|
||||||
NonCopyable::~NonCopyable() {}
|
NonCopyable::~NonCopyable() {}
|
||||||
@ -66,6 +67,7 @@ namespace Catch {
|
|||||||
|
|
||||||
StreamingReporterBase::~StreamingReporterBase() {}
|
StreamingReporterBase::~StreamingReporterBase() {}
|
||||||
ConsoleReporter::~ConsoleReporter() {}
|
ConsoleReporter::~ConsoleReporter() {}
|
||||||
|
CompactReporter::~CompactReporter() {}
|
||||||
IRunner::~IRunner() {}
|
IRunner::~IRunner() {}
|
||||||
IMutableContext::~IMutableContext() {}
|
IMutableContext::~IMutableContext() {}
|
||||||
IConfig::~IConfig() {}
|
IConfig::~IConfig() {}
|
||||||
|
|||||||
294
include/reporters/catch_reporter_compact.hpp
Normal file
294
include/reporters/catch_reporter_compact.hpp
Normal file
@ -0,0 +1,294 @@
|
|||||||
|
/*
|
||||||
|
* Created by Martin Moene on 2013-12-05.
|
||||||
|
* Copyright 2012 Martin Moene. All rights reserved.
|
||||||
|
*
|
||||||
|
* Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||||
|
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
*/
|
||||||
|
#ifndef TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED
|
||||||
|
#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED
|
||||||
|
|
||||||
|
#include "catch_reporter_bases.hpp"
|
||||||
|
|
||||||
|
#include "../internal/catch_reporter_registrars.hpp"
|
||||||
|
#include "../internal/catch_console_colour.hpp"
|
||||||
|
|
||||||
|
namespace Catch {
|
||||||
|
|
||||||
|
struct CompactReporter : StreamingReporterBase {
|
||||||
|
|
||||||
|
CompactReporter( ReporterConfig const& _config )
|
||||||
|
: StreamingReporterBase( _config )
|
||||||
|
{}
|
||||||
|
|
||||||
|
virtual ~CompactReporter();
|
||||||
|
|
||||||
|
static std::string getDescription() {
|
||||||
|
return "Reports test results on a single line, suitable for IDEs";
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual ReporterPreferences getPreferences() const {
|
||||||
|
ReporterPreferences prefs;
|
||||||
|
prefs.shouldRedirectStdOut = false;
|
||||||
|
return prefs;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void noMatchingTestCases( std::string const& spec ) {
|
||||||
|
stream << "No test cases matched '" << spec << "'" << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void assertionStarting( AssertionInfo const& ) {
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool assertionEnded( AssertionStats const& _assertionStats ) {
|
||||||
|
AssertionResult const& result = _assertionStats.assertionResult;
|
||||||
|
|
||||||
|
bool printInfoMessages = true;
|
||||||
|
|
||||||
|
// Drop out if result was successful and we're not printing those
|
||||||
|
if( !m_config->includeSuccessfulResults() && result.isOk() ) {
|
||||||
|
if( result.getResultType() != ResultWas::Warning )
|
||||||
|
return false;
|
||||||
|
printInfoMessages = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
|
||||||
|
printer.print();
|
||||||
|
|
||||||
|
stream << std::endl;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void testRunEnded( TestRunStats const& _testRunStats ) {
|
||||||
|
printTotals( _testRunStats.totals );
|
||||||
|
stream << "\n" << std::endl;
|
||||||
|
StreamingReporterBase::testRunEnded( _testRunStats );
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
class AssertionPrinter {
|
||||||
|
void operator= ( AssertionPrinter const& );
|
||||||
|
public:
|
||||||
|
AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
|
||||||
|
: stream( _stream )
|
||||||
|
, stats( _stats )
|
||||||
|
, result( _stats.assertionResult )
|
||||||
|
, messages( _stats.infoMessages )
|
||||||
|
, itMessage( _stats.infoMessages.begin() )
|
||||||
|
, printInfoMessages( _printInfoMessages )
|
||||||
|
{}
|
||||||
|
|
||||||
|
void print() {
|
||||||
|
printSourceInfo();
|
||||||
|
|
||||||
|
itMessage = messages.begin();
|
||||||
|
|
||||||
|
switch( result.getResultType() ) {
|
||||||
|
case ResultWas::Ok:
|
||||||
|
printResultType( Colour::ResultSuccess, passedString() );
|
||||||
|
printOriginalExpression();
|
||||||
|
printReconstructedExpression();
|
||||||
|
if ( ! result.hasExpression() )
|
||||||
|
printRemainingMessages( Colour::None );
|
||||||
|
else
|
||||||
|
printRemainingMessages();
|
||||||
|
break;
|
||||||
|
case ResultWas::ExpressionFailed:
|
||||||
|
if( result.isOk() )
|
||||||
|
printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) );
|
||||||
|
else
|
||||||
|
printResultType( Colour::Error, failedString() );
|
||||||
|
printOriginalExpression();
|
||||||
|
printReconstructedExpression();
|
||||||
|
printRemainingMessages();
|
||||||
|
break;
|
||||||
|
case ResultWas::ThrewException:
|
||||||
|
printResultType( Colour::Error, failedString() );
|
||||||
|
printIssue( "unexpected exception with message:" );
|
||||||
|
printMessage();
|
||||||
|
printExpressionWas();
|
||||||
|
printRemainingMessages();
|
||||||
|
break;
|
||||||
|
case ResultWas::DidntThrowException:
|
||||||
|
printResultType( Colour::Error, failedString() );
|
||||||
|
printIssue( "expected exception, got none" );
|
||||||
|
printExpressionWas();
|
||||||
|
printRemainingMessages();
|
||||||
|
break;
|
||||||
|
case ResultWas::Info:
|
||||||
|
printResultType( Colour::None, "info" );
|
||||||
|
printMessage();
|
||||||
|
printRemainingMessages();
|
||||||
|
break;
|
||||||
|
case ResultWas::Warning:
|
||||||
|
printResultType( Colour::None, "warning" );
|
||||||
|
printMessage();
|
||||||
|
printRemainingMessages();
|
||||||
|
break;
|
||||||
|
case ResultWas::ExplicitFailure:
|
||||||
|
printResultType( Colour::Error, failedString() );
|
||||||
|
printIssue( "explicitly" );
|
||||||
|
printRemainingMessages( Colour::None );
|
||||||
|
break;
|
||||||
|
// These cases are here to prevent compiler warnings
|
||||||
|
case ResultWas::Unknown:
|
||||||
|
case ResultWas::FailureBit:
|
||||||
|
case ResultWas::Exception:
|
||||||
|
printResultType( Colour::Error, "** internal error **" );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
// Colour::LightGrey
|
||||||
|
|
||||||
|
static Colour dimColour() { return Colour::FileName; }
|
||||||
|
|
||||||
|
#ifdef CATCH_PLATFORM_MAC
|
||||||
|
static const char* failedString() { return "FAILED"; }
|
||||||
|
static const char* passedString() { return "PASSED"; }
|
||||||
|
#else
|
||||||
|
static const char* failedString() { return "failed"; }
|
||||||
|
static const char* passedString() { return "passed"; }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void printSourceInfo() const {
|
||||||
|
Colour colourGuard( Colour::FileName );
|
||||||
|
stream << result.getSourceInfo() << ":";
|
||||||
|
}
|
||||||
|
|
||||||
|
void printResultType( Colour colour, std::string passOrFail ) const {
|
||||||
|
if( !passOrFail.empty() ) {
|
||||||
|
{
|
||||||
|
Colour colourGuard( colour );
|
||||||
|
stream << " " << passOrFail;
|
||||||
|
}
|
||||||
|
stream << ":";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printIssue( std::string issue ) const {
|
||||||
|
stream << " " << issue;
|
||||||
|
}
|
||||||
|
|
||||||
|
void printExpressionWas() {
|
||||||
|
if( result.hasExpression() ) {
|
||||||
|
stream << ";";
|
||||||
|
{
|
||||||
|
Colour colour( dimColour() );
|
||||||
|
stream << " expression was:";
|
||||||
|
}
|
||||||
|
printOriginalExpression();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printOriginalExpression() const {
|
||||||
|
if( result.hasExpression() ) {
|
||||||
|
stream << " " << result.getExpression();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printReconstructedExpression() const {
|
||||||
|
if( result.hasExpandedExpression() ) {
|
||||||
|
{
|
||||||
|
Colour colour( dimColour() );
|
||||||
|
stream << " for: ";
|
||||||
|
}
|
||||||
|
stream << result.getExpandedExpression();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printMessage() {
|
||||||
|
if ( itMessage != messages.end() ) {
|
||||||
|
stream << " '" << itMessage->message << "'";
|
||||||
|
++itMessage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void printRemainingMessages( Colour colour = dimColour() ) {
|
||||||
|
if ( itMessage == messages.end() )
|
||||||
|
return;
|
||||||
|
|
||||||
|
// using messages.end() directly yields compilation error:
|
||||||
|
std::vector<MessageInfo>::const_iterator itEnd = messages.end();
|
||||||
|
const std::size_t N = static_cast<std::size_t>( std::distance( itMessage, itEnd ) );
|
||||||
|
|
||||||
|
{
|
||||||
|
Colour colourGuard( colour );
|
||||||
|
stream << " with " << pluralise( N, "message" ) << ":";
|
||||||
|
}
|
||||||
|
|
||||||
|
for(; itMessage != itEnd; ) {
|
||||||
|
// If this assertion is a warning ignore any INFO messages
|
||||||
|
if( printInfoMessages || itMessage->type != ResultWas::Info ) {
|
||||||
|
stream << " '" << itMessage->message << "'";
|
||||||
|
if ( ++itMessage != itEnd ) {
|
||||||
|
Colour colourGuard( dimColour() );
|
||||||
|
stream << " and";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::ostream& stream;
|
||||||
|
AssertionStats const& stats;
|
||||||
|
AssertionResult const& result;
|
||||||
|
std::vector<MessageInfo> messages;
|
||||||
|
std::vector<MessageInfo>::const_iterator itMessage;
|
||||||
|
bool printInfoMessages;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Colour, message variants:
|
||||||
|
// - white: No tests ran.
|
||||||
|
// - red: Failed [both/all] N test cases, failed [both/all] M assertions.
|
||||||
|
// - white: Passed [both/all] N test cases (no assertions).
|
||||||
|
// - red: Failed N tests cases, failed M assertions.
|
||||||
|
// - green: Passed [both/all] N tests cases with M assertions.
|
||||||
|
|
||||||
|
std::string both_or_all( int count ) const {
|
||||||
|
return count == 1 ? "" : count == 2 ? "both " : "all " ;
|
||||||
|
}
|
||||||
|
|
||||||
|
void printTotals( const Totals& totals ) const {
|
||||||
|
if( totals.testCases.total() == 0 ) {
|
||||||
|
stream << "No tests ran.";
|
||||||
|
}
|
||||||
|
else if( totals.testCases.failed == totals.testCases.total() ) {
|
||||||
|
Colour colour( Colour::ResultError );
|
||||||
|
const std::string qualify_assertions_failed =
|
||||||
|
totals.assertions.failed == totals.assertions.total() ?
|
||||||
|
both_or_all( totals.assertions.failed ) : "";
|
||||||
|
stream <<
|
||||||
|
"Failed " << both_or_all( totals.testCases.failed )
|
||||||
|
<< pluralise( totals.testCases.failed, "test case" ) << ", "
|
||||||
|
"failed " << qualify_assertions_failed <<
|
||||||
|
pluralise( totals.assertions.failed, "assertion" ) << ".";
|
||||||
|
}
|
||||||
|
else if( totals.assertions.total() == 0 ) {
|
||||||
|
stream <<
|
||||||
|
"Passed " << both_or_all( totals.testCases.total() )
|
||||||
|
<< pluralise( totals.testCases.total(), "test case" )
|
||||||
|
<< " (no assertions).";
|
||||||
|
}
|
||||||
|
else if( totals.assertions.failed ) {
|
||||||
|
Colour colour( Colour::ResultError );
|
||||||
|
stream <<
|
||||||
|
"Failed " << pluralise( totals.testCases.failed, "test case" ) << ", "
|
||||||
|
"failed " << pluralise( totals.assertions.failed, "assertion" ) << ".";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Colour colour( Colour::ResultSuccess );
|
||||||
|
stream <<
|
||||||
|
"Passed " << both_or_all( totals.testCases.passed )
|
||||||
|
<< pluralise( totals.testCases.passed, "test case" ) <<
|
||||||
|
" with " << pluralise( totals.assertions.passed, "assertion" ) << ".";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter )
|
||||||
|
|
||||||
|
} // end namespace Catch
|
||||||
|
|
||||||
|
#endif // TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED
|
||||||
@ -82,6 +82,7 @@
|
|||||||
2694A1FB16A0000E004816E3 /* catch_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catch_text.cpp; sourceTree = "<group>"; };
|
2694A1FB16A0000E004816E3 /* catch_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = catch_text.cpp; sourceTree = "<group>"; };
|
||||||
269831E519078C1600BB0CE0 /* catch_tostring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_tostring.h; sourceTree = "<group>"; };
|
269831E519078C1600BB0CE0 /* catch_tostring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catch_tostring.h; sourceTree = "<group>"; };
|
||||||
269831E619078CA200BB0CE0 /* catch_tostring.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_tostring.hpp; sourceTree = "<group>"; };
|
269831E619078CA200BB0CE0 /* catch_tostring.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_tostring.hpp; sourceTree = "<group>"; };
|
||||||
|
269831E719121CA500BB0CE0 /* catch_reporter_compact.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = catch_reporter_compact.hpp; sourceTree = "<group>"; };
|
||||||
26AEAF1617BEA18E009E32C9 /* catch_platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_platform.h; sourceTree = "<group>"; };
|
26AEAF1617BEA18E009E32C9 /* catch_platform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_platform.h; sourceTree = "<group>"; };
|
||||||
26DACF2F17206D3400A21326 /* catch_text.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_text.h; sourceTree = "<group>"; };
|
26DACF2F17206D3400A21326 /* catch_text.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = catch_text.h; sourceTree = "<group>"; };
|
||||||
4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_info.hpp; sourceTree = "<group>"; };
|
4A084F1C15DACEEA0027E631 /* catch_test_case_info.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = catch_test_case_info.hpp; sourceTree = "<group>"; };
|
||||||
@ -285,6 +286,7 @@
|
|||||||
4A6D0C65149B3E3D00DB3EAA /* reporters */ = {
|
4A6D0C65149B3E3D00DB3EAA /* reporters */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
269831E719121CA500BB0CE0 /* catch_reporter_compact.hpp */,
|
||||||
262E7399184673A800CAC268 /* catch_reporter_bases.hpp */,
|
262E7399184673A800CAC268 /* catch_reporter_bases.hpp */,
|
||||||
4A6D0C67149B3E3D00DB3EAA /* catch_reporter_junit.hpp */,
|
4A6D0C67149B3E3D00DB3EAA /* catch_reporter_junit.hpp */,
|
||||||
4A6D0C68149B3E3D00DB3EAA /* catch_reporter_xml.hpp */,
|
4A6D0C68149B3E3D00DB3EAA /* catch_reporter_xml.hpp */,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user