mirror of
https://github.com/catchorg/Catch2.git
synced 2025-10-31 12:17:11 +01:00
Removed basic reporter
This commit is contained in:
Phil Nash
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* CATCH v1.0 build 7 (master branch)
|
||||
* Generated: 2013-08-15 18:59:14.088519
|
||||
* Generated: 2013-08-15 19:08:20.526513
|
||||
* ----------------------------------------------------------
|
||||
* This file has been merged from multiple headers. Please don't edit it directly
|
||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||
@@ -6620,8 +6620,8 @@ namespace Catch {
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
// #included from: ../reporters/catch_reporter_basic.hpp
|
||||
#define TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
|
||||
// #included from: ../reporters/catch_reporter_xml.hpp
|
||||
#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
|
||||
|
||||
// #included from: ../internal/catch_reporter_registrars.hpp
|
||||
#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
|
||||
@@ -6632,7 +6632,6 @@ namespace Catch {
|
||||
class LegacyReporterRegistrar {
|
||||
|
||||
class ReporterFactory : public IReporterFactory {
|
||||
|
||||
virtual IStreamingReporter* create( ReporterConfig const& config ) const {
|
||||
return new LegacyReporterAdapter( new T( config ) );
|
||||
}
|
||||
@@ -6687,346 +6686,6 @@ namespace Catch {
|
||||
#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
|
||||
Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
|
||||
|
||||
namespace Catch {
|
||||
|
||||
class BasicReporter : public SharedImpl<IReporter> {
|
||||
|
||||
struct SpanInfo {
|
||||
|
||||
SpanInfo()
|
||||
: emitted( false )
|
||||
{}
|
||||
|
||||
SpanInfo( const std::string& spanName )
|
||||
: name( spanName ),
|
||||
emitted( false )
|
||||
{}
|
||||
|
||||
SpanInfo( const SpanInfo& other )
|
||||
: name( other.name ),
|
||||
emitted( other.emitted )
|
||||
{}
|
||||
|
||||
std::string name;
|
||||
bool emitted;
|
||||
};
|
||||
|
||||
public:
|
||||
BasicReporter( const ReporterConfig& config )
|
||||
: m_config( config ),
|
||||
m_firstSectionInTestCase( true ),
|
||||
m_aborted( false )
|
||||
{}
|
||||
|
||||
virtual ~BasicReporter();
|
||||
|
||||
static std::string getDescription() {
|
||||
return "Reports test results as lines of text";
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
void ReportCounts( const std::string& label, const Counts& counts, const std::string& allPrefix = "All " ) {
|
||||
if( counts.passed )
|
||||
m_config.stream() << counts.failed << " of " << counts.total() << " " << label << "s failed";
|
||||
else
|
||||
m_config.stream() << ( counts.failed > 1 ? allPrefix : "" ) << pluralise( counts.failed, label ) << " failed";
|
||||
}
|
||||
|
||||
void ReportCounts( const Totals& totals, const std::string& allPrefix = "All " ) {
|
||||
if( totals.assertions.total() == 0 ) {
|
||||
m_config.stream() << "No tests ran";
|
||||
}
|
||||
else if( totals.assertions.failed ) {
|
||||
Colour colour( Colour::ResultError );
|
||||
ReportCounts( "test case", totals.testCases, allPrefix );
|
||||
if( totals.testCases.failed > 0 ) {
|
||||
m_config.stream() << " (";
|
||||
ReportCounts( "assertion", totals.assertions, allPrefix );
|
||||
m_config.stream() << ")";
|
||||
}
|
||||
}
|
||||
else {
|
||||
Colour colour( Colour::ResultSuccess );
|
||||
m_config.stream() << allPrefix << "tests passed ("
|
||||
<< pluralise( totals.assertions.passed, "assertion" ) << " in "
|
||||
<< pluralise( totals.testCases.passed, "test case" ) << ")";
|
||||
}
|
||||
}
|
||||
|
||||
private: // IReporter
|
||||
|
||||
virtual bool shouldRedirectStdout() const {
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual void StartTesting() {
|
||||
m_testingSpan = SpanInfo();
|
||||
}
|
||||
|
||||
virtual void Aborted() {
|
||||
m_aborted = true;
|
||||
}
|
||||
|
||||
virtual void EndTesting( const Totals& totals ) {
|
||||
// Output the overall test results even if "Started Testing" was not emitted
|
||||
if( m_aborted ) {
|
||||
m_config.stream() << "\n[Testing aborted. ";
|
||||
ReportCounts( totals, "The first " );
|
||||
}
|
||||
else {
|
||||
m_config.stream() << "\n[Testing completed. ";
|
||||
ReportCounts( totals );
|
||||
}
|
||||
m_config.stream() << "]\n" << std::endl;
|
||||
}
|
||||
|
||||
virtual void StartGroup( const std::string& groupName ) {
|
||||
m_groupSpan = groupName;
|
||||
}
|
||||
|
||||
virtual void EndGroup( const std::string& groupName, const Totals& totals ) {
|
||||
if( m_groupSpan.emitted && !groupName.empty() ) {
|
||||
m_config.stream() << "[End of group: '" << groupName << "'. ";
|
||||
ReportCounts( totals );
|
||||
m_config.stream() << "]\n" << std::endl;
|
||||
m_groupSpan = SpanInfo();
|
||||
}
|
||||
}
|
||||
|
||||
virtual void StartTestCase( const TestCaseInfo& testInfo ) {
|
||||
m_testSpan = testInfo.name;
|
||||
}
|
||||
|
||||
virtual void StartSection( const std::string& sectionName, const std::string& ) {
|
||||
m_sectionSpans.push_back( SpanInfo( sectionName ) );
|
||||
}
|
||||
|
||||
virtual void NoAssertionsInSection( const std::string& sectionName ) {
|
||||
startSpansLazily();
|
||||
Colour colour( Colour::ResultError );
|
||||
m_config.stream() << "\nNo assertions in section, '" << sectionName << "'\n" << std::endl;
|
||||
}
|
||||
virtual void NoAssertionsInTestCase( const std::string& testName ) {
|
||||
startSpansLazily();
|
||||
Colour colour( Colour::ResultError );
|
||||
m_config.stream() << "\nNo assertions in test case, '" << testName << "'\n" << std::endl;
|
||||
}
|
||||
|
||||
virtual void EndSection( const std::string& sectionName, const Counts& assertions ) {
|
||||
|
||||
SpanInfo& sectionSpan = m_sectionSpans.back();
|
||||
if( sectionSpan.emitted && !sectionSpan.name.empty() ) {
|
||||
m_config.stream() << "[End of section: '" << sectionName << "' ";
|
||||
|
||||
if( assertions.failed ) {
|
||||
Colour colour( Colour::ResultError );
|
||||
ReportCounts( "assertion", assertions);
|
||||
}
|
||||
else {
|
||||
Colour colour( Colour::ResultSuccess );
|
||||
m_config.stream() << ( assertions.passed > 1 ? "All " : "" )
|
||||
<< pluralise( assertions.passed, "assertion" ) << " passed" ;
|
||||
}
|
||||
m_config.stream() << "]\n" << std::endl;
|
||||
}
|
||||
m_sectionSpans.pop_back();
|
||||
}
|
||||
|
||||
virtual void Result( const AssertionResult& assertionResult ) {
|
||||
if( !m_config.fullConfig()->includeSuccessfulResults() && assertionResult.getResultType() == ResultWas::Ok )
|
||||
return;
|
||||
|
||||
startSpansLazily();
|
||||
|
||||
if( !assertionResult.getSourceInfo().empty() ) {
|
||||
Colour colour( Colour::FileName );
|
||||
m_config.stream() << assertionResult.getSourceInfo() << ": ";
|
||||
}
|
||||
|
||||
if( assertionResult.hasExpression() ) {
|
||||
Colour colour( Colour::OriginalExpression );
|
||||
m_config.stream() << assertionResult.getExpression();
|
||||
if( assertionResult.succeeded() ) {
|
||||
Colour successColour( Colour::Success );
|
||||
m_config.stream() << " succeeded";
|
||||
}
|
||||
else {
|
||||
Colour errorColour( Colour::Error );
|
||||
m_config.stream() << " failed";
|
||||
if( assertionResult.isOk() ) {
|
||||
Colour okAnywayColour( Colour::Success );
|
||||
m_config.stream() << " - but was ok";
|
||||
}
|
||||
}
|
||||
}
|
||||
switch( assertionResult.getResultType() ) {
|
||||
case ResultWas::ThrewException:
|
||||
{
|
||||
Colour colour( Colour::Error );
|
||||
if( assertionResult.hasExpression() )
|
||||
m_config.stream() << " with unexpected";
|
||||
else
|
||||
m_config.stream() << "Unexpected";
|
||||
m_config.stream() << " exception with message: '" << assertionResult.getMessage() << "'";
|
||||
}
|
||||
break;
|
||||
case ResultWas::DidntThrowException:
|
||||
{
|
||||
Colour colour( Colour::Error );
|
||||
if( assertionResult.hasExpression() )
|
||||
m_config.stream() << " because no exception was thrown where one was expected";
|
||||
else
|
||||
m_config.stream() << "No exception thrown where one was expected";
|
||||
}
|
||||
break;
|
||||
case ResultWas::Info:
|
||||
{
|
||||
Colour colour( Colour::ReconstructedExpression );
|
||||
streamVariableLengthText( "info", assertionResult.getMessage() );
|
||||
}
|
||||
break;
|
||||
case ResultWas::Warning:
|
||||
{
|
||||
Colour colour( Colour::ReconstructedExpression );
|
||||
streamVariableLengthText( "warning", assertionResult.getMessage() );
|
||||
}
|
||||
break;
|
||||
case ResultWas::ExplicitFailure:
|
||||
{
|
||||
Colour colour( Colour::Error );
|
||||
m_config.stream() << "failed with message: '" << assertionResult.getMessage() << "'";
|
||||
}
|
||||
break;
|
||||
case ResultWas::Unknown: // These cases are here to prevent compiler warnings
|
||||
case ResultWas::Ok:
|
||||
case ResultWas::FailureBit:
|
||||
case ResultWas::ExpressionFailed:
|
||||
case ResultWas::Exception:
|
||||
if( !assertionResult.hasExpression() ) {
|
||||
if( assertionResult.succeeded() ) {
|
||||
Colour colour( Colour::Success );
|
||||
m_config.stream() << " succeeded";
|
||||
}
|
||||
else {
|
||||
Colour colour( Colour::Error );
|
||||
m_config.stream() << " failed";
|
||||
if( assertionResult.isOk() ) {
|
||||
Colour okAnywayColour( Colour::Success );
|
||||
m_config.stream() << " - but was ok";
|
||||
}
|
||||
}
|
||||
}
|
||||
if( assertionResult.hasMessage() ) {
|
||||
m_config.stream() << "\n";
|
||||
Colour colour( Colour::ReconstructedExpression );
|
||||
streamVariableLengthText( "with message", assertionResult.getMessage() );
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if( assertionResult.hasExpandedExpression() ) {
|
||||
m_config.stream() << " for: ";
|
||||
if( assertionResult.getExpandedExpression().size() > 40 ) {
|
||||
m_config.stream() << "\n";
|
||||
if( assertionResult.getExpandedExpression().size() < 70 )
|
||||
m_config.stream() << "\t";
|
||||
}
|
||||
Colour colour( Colour::ReconstructedExpression );
|
||||
m_config.stream() << assertionResult.getExpandedExpression();
|
||||
}
|
||||
m_config.stream() << std::endl;
|
||||
}
|
||||
|
||||
virtual void EndTestCase( const TestCaseInfo& testInfo,
|
||||
const Totals& totals,
|
||||
const std::string& stdOut,
|
||||
const std::string& stdErr ) {
|
||||
if( !stdOut.empty() ) {
|
||||
startSpansLazily();
|
||||
streamVariableLengthText( "stdout", stdOut );
|
||||
}
|
||||
|
||||
if( !stdErr.empty() ) {
|
||||
startSpansLazily();
|
||||
streamVariableLengthText( "stderr", stdErr );
|
||||
}
|
||||
|
||||
if( m_testSpan.emitted ) {
|
||||
m_config.stream() << "[Finished: '" << testInfo.name << "' ";
|
||||
ReportCounts( totals );
|
||||
m_config.stream() << "]" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
private: // helpers
|
||||
|
||||
void startSpansLazily() {
|
||||
if( !m_testingSpan.emitted ) {
|
||||
if( m_config.fullConfig()->name().empty() )
|
||||
m_config.stream() << "[Started testing]" << std::endl;
|
||||
else
|
||||
m_config.stream() << "[Started testing: " << m_config.fullConfig()->name() << "]" << std::endl;
|
||||
m_testingSpan.emitted = true;
|
||||
}
|
||||
|
||||
if( !m_groupSpan.emitted && !m_groupSpan.name.empty() ) {
|
||||
m_config.stream() << "[Started group: '" << m_groupSpan.name << "']" << std::endl;
|
||||
m_groupSpan.emitted = true;
|
||||
}
|
||||
|
||||
if( !m_testSpan.emitted ) {
|
||||
m_config.stream() << std::endl << "[Running: " << m_testSpan.name << "]" << std::endl;
|
||||
m_testSpan.emitted = true;
|
||||
}
|
||||
|
||||
if( !m_sectionSpans.empty() ) {
|
||||
SpanInfo& sectionSpan = m_sectionSpans.back();
|
||||
if( !sectionSpan.emitted && !sectionSpan.name.empty() ) {
|
||||
if( m_firstSectionInTestCase ) {
|
||||
m_config.stream() << "\n";
|
||||
m_firstSectionInTestCase = false;
|
||||
}
|
||||
std::vector<SpanInfo>::iterator it = m_sectionSpans.begin();
|
||||
std::vector<SpanInfo>::iterator itEnd = m_sectionSpans.end();
|
||||
for(; it != itEnd; ++it ) {
|
||||
SpanInfo& prevSpan = *it;
|
||||
if( !prevSpan.emitted && !prevSpan.name.empty() ) {
|
||||
m_config.stream() << "[Started section: '" << prevSpan.name << "']" << std::endl;
|
||||
prevSpan.emitted = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void streamVariableLengthText( const std::string& prefix, const std::string& text ) {
|
||||
std::string trimmed = trim( text );
|
||||
if( trimmed.find_first_of( "\r\n" ) == std::string::npos ) {
|
||||
m_config.stream() << "[" << prefix << ": " << trimmed << "]";
|
||||
}
|
||||
else {
|
||||
m_config.stream() << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed
|
||||
<< "\n[end of " << prefix << "] <<<<<<<<<<<<<<<<<<<<<<<<\n";
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
ReporterConfig m_config;
|
||||
bool m_firstSectionInTestCase;
|
||||
|
||||
SpanInfo m_testingSpan;
|
||||
SpanInfo m_groupSpan;
|
||||
SpanInfo m_testSpan;
|
||||
std::vector<SpanInfo> m_sectionSpans;
|
||||
bool m_aborted;
|
||||
};
|
||||
|
||||
} // end namespace Catch
|
||||
|
||||
// #included from: ../reporters/catch_reporter_xml.hpp
|
||||
#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
|
||||
|
||||
// #included from: ../internal/catch_xmlwriter.hpp
|
||||
#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
|
||||
|
||||
@@ -7978,7 +7637,6 @@ namespace Catch {
|
||||
CumulativeReporterBase::SectionNode::~SectionNode() {}
|
||||
CumulativeReporterBase::~CumulativeReporterBase() {}
|
||||
|
||||
BasicReporter::~BasicReporter() {}
|
||||
StreamingReporterBase::~StreamingReporterBase() {}
|
||||
ConsoleReporter::~ConsoleReporter() {}
|
||||
IRunner::~IRunner() {}
|
||||
@@ -8001,7 +7659,6 @@ namespace Catch {
|
||||
|
||||
void Config::dummy() {}
|
||||
|
||||
INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( "basic", BasicReporter )
|
||||
INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( "xml", XmlReporter )
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user