mirror of
https://github.com/catchorg/Catch2.git
synced 2025-06-01 09:27:54 +00:00
Made ReportConfig a value type
This commit is contained in:
Phil Nash
parent
f606517376
commit
d2553cdc64
10 changed files with 156 additions and 134 deletions
|
|
@ -55,7 +55,7 @@ namespace Catch {
|
|||
};
|
||||
|
||||
public:
|
||||
BasicReporter( const IReporterConfig& config )
|
||||
BasicReporter( const ReporterConfig& config )
|
||||
: m_config( config ),
|
||||
m_firstSectionInTestCase( true ),
|
||||
m_aborted( false )
|
||||
|
|
@ -69,27 +69,27 @@ namespace Catch {
|
|||
|
||||
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";
|
||||
m_config.stream << counts.failed << " of " << counts.total() << " " << label << "s failed";
|
||||
else
|
||||
m_config.stream() << ( counts.failed > 1 ? allPrefix : "" ) << pluralise( counts.failed, label ) << " failed";
|
||||
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";
|
||||
m_config.stream << "No tests ran";
|
||||
}
|
||||
else if( totals.assertions.failed ) {
|
||||
TextColour colour( TextColour::ResultError );
|
||||
ReportCounts( "test case", totals.testCases, allPrefix );
|
||||
if( totals.testCases.failed > 0 ) {
|
||||
m_config.stream() << " (";
|
||||
m_config.stream << " (";
|
||||
ReportCounts( "assertion", totals.assertions, allPrefix );
|
||||
m_config.stream() << ")";
|
||||
m_config.stream << ")";
|
||||
}
|
||||
}
|
||||
else {
|
||||
TextColour colour( TextColour::ResultSuccess );
|
||||
m_config.stream() << allPrefix << "tests passed ("
|
||||
m_config.stream << allPrefix << "tests passed ("
|
||||
<< pluralise( totals.assertions.passed, "assertion" ) << " in "
|
||||
<< pluralise( totals.testCases.passed, "test case" ) << ")";
|
||||
}
|
||||
|
|
@ -112,14 +112,14 @@ namespace Catch {
|
|||
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. ";
|
||||
m_config.stream << "\n[Testing aborted. ";
|
||||
ReportCounts( totals, "The first " );
|
||||
}
|
||||
else {
|
||||
m_config.stream() << "\n[Testing completed. ";
|
||||
m_config.stream << "\n[Testing completed. ";
|
||||
ReportCounts( totals );
|
||||
}
|
||||
m_config.stream() << "]\n" << std::endl;
|
||||
m_config.stream << "]\n" << std::endl;
|
||||
}
|
||||
|
||||
virtual void StartGroup( const std::string& groupName ) {
|
||||
|
|
@ -128,9 +128,9 @@ namespace Catch {
|
|||
|
||||
virtual void EndGroup( const std::string& groupName, const Totals& totals ) {
|
||||
if( m_groupSpan.emitted && !groupName.empty() ) {
|
||||
m_config.stream() << "[End of group: '" << groupName << "'. ";
|
||||
m_config.stream << "[End of group: '" << groupName << "'. ";
|
||||
ReportCounts( totals );
|
||||
m_config.stream() << "]\n" << std::endl;
|
||||
m_config.stream << "]\n" << std::endl;
|
||||
m_groupSpan = SpanInfo();
|
||||
}
|
||||
}
|
||||
|
|
@ -146,7 +146,7 @@ namespace Catch {
|
|||
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 << "' ";
|
||||
m_config.stream << "[End of section: '" << sectionName << "' ";
|
||||
|
||||
if( assertions.failed ) {
|
||||
TextColour colour( TextColour::ResultError );
|
||||
|
|
@ -154,35 +154,35 @@ namespace Catch {
|
|||
}
|
||||
else {
|
||||
TextColour colour( TextColour::ResultSuccess );
|
||||
m_config.stream() << ( assertions.passed > 1 ? "All " : "" )
|
||||
m_config.stream << ( assertions.passed > 1 ? "All " : "" )
|
||||
<< pluralise( assertions.passed, "assertion" ) << " passed" ;
|
||||
}
|
||||
m_config.stream() << "]\n" << std::endl;
|
||||
m_config.stream << "]\n" << std::endl;
|
||||
}
|
||||
m_sectionSpans.pop_back();
|
||||
}
|
||||
|
||||
virtual void Result( const ResultInfo& resultInfo ) {
|
||||
if( !m_config.includeSuccessfulResults() && resultInfo.getResultType() == ResultWas::Ok )
|
||||
if( !m_config.includeSuccessfulResults && resultInfo.getResultType() == ResultWas::Ok )
|
||||
return;
|
||||
|
||||
StartSpansLazily();
|
||||
|
||||
if( !resultInfo.getFilename().empty() ) {
|
||||
TextColour colour( TextColour::FileName );
|
||||
m_config.stream() << SourceLineInfo( resultInfo.getFilename(), resultInfo.getLine() );
|
||||
m_config.stream << SourceLineInfo( resultInfo.getFilename(), resultInfo.getLine() );
|
||||
}
|
||||
|
||||
if( resultInfo.hasExpression() ) {
|
||||
TextColour colour( TextColour::OriginalExpression );
|
||||
m_config.stream() << resultInfo.getExpression();
|
||||
m_config.stream << resultInfo.getExpression();
|
||||
if( resultInfo.ok() ) {
|
||||
TextColour successColour( TextColour::Success );
|
||||
m_config.stream() << " succeeded";
|
||||
m_config.stream << " succeeded";
|
||||
}
|
||||
else {
|
||||
TextColour errorColour( TextColour::Error );
|
||||
m_config.stream() << " failed";
|
||||
m_config.stream << " failed";
|
||||
}
|
||||
}
|
||||
switch( resultInfo.getResultType() ) {
|
||||
|
|
@ -190,31 +190,31 @@ namespace Catch {
|
|||
{
|
||||
TextColour colour( TextColour::Error );
|
||||
if( resultInfo.hasExpression() )
|
||||
m_config.stream() << " with unexpected";
|
||||
m_config.stream << " with unexpected";
|
||||
else
|
||||
m_config.stream() << "Unexpected";
|
||||
m_config.stream() << " exception with message: '" << resultInfo.getMessage() << "'";
|
||||
m_config.stream << "Unexpected";
|
||||
m_config.stream << " exception with message: '" << resultInfo.getMessage() << "'";
|
||||
}
|
||||
break;
|
||||
case ResultWas::DidntThrowException:
|
||||
{
|
||||
TextColour colour( TextColour::Error );
|
||||
if( resultInfo.hasExpression() )
|
||||
m_config.stream() << " because no exception was thrown where one was expected";
|
||||
m_config.stream << " because no exception was thrown where one was expected";
|
||||
else
|
||||
m_config.stream() << "No exception thrown where one was expected";
|
||||
m_config.stream << "No exception thrown where one was expected";
|
||||
}
|
||||
break;
|
||||
case ResultWas::Info:
|
||||
streamVariableLengthText( "info", resultInfo.getMessage() );
|
||||
break;
|
||||
case ResultWas::Warning:
|
||||
m_config.stream() << "warning:\n'" << resultInfo.getMessage() << "'";
|
||||
m_config.stream << "warning:\n'" << resultInfo.getMessage() << "'";
|
||||
break;
|
||||
case ResultWas::ExplicitFailure:
|
||||
{
|
||||
TextColour colour( TextColour::Error );
|
||||
m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'";
|
||||
m_config.stream << "failed with message: '" << resultInfo.getMessage() << "'";
|
||||
}
|
||||
break;
|
||||
case ResultWas::Unknown: // These cases are here to prevent compiler warnings
|
||||
|
|
@ -226,22 +226,22 @@ namespace Catch {
|
|||
if( !resultInfo.hasExpression() ) {
|
||||
if( resultInfo.ok() ) {
|
||||
TextColour colour( TextColour::Success );
|
||||
m_config.stream() << " succeeded";
|
||||
m_config.stream << " succeeded";
|
||||
}
|
||||
else {
|
||||
TextColour colour( TextColour::Error );
|
||||
m_config.stream() << " failed";
|
||||
m_config.stream << " failed";
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if( resultInfo.hasExpandedExpression() ) {
|
||||
m_config.stream() << " for: ";
|
||||
m_config.stream << " for: ";
|
||||
TextColour colour( TextColour::ReconstructedExpression );
|
||||
m_config.stream() << resultInfo.getExpandedExpression();
|
||||
m_config.stream << resultInfo.getExpandedExpression();
|
||||
}
|
||||
m_config.stream() << std::endl;
|
||||
m_config.stream << std::endl;
|
||||
}
|
||||
|
||||
virtual void EndTestCase( const TestCaseInfo& testInfo,
|
||||
|
|
@ -259,9 +259,9 @@ namespace Catch {
|
|||
}
|
||||
|
||||
if( m_testSpan.emitted ) {
|
||||
m_config.stream() << "[Finished: '" << testInfo.getName() << "' ";
|
||||
m_config.stream << "[Finished: '" << testInfo.getName() << "' ";
|
||||
ReportCounts( totals );
|
||||
m_config.stream() << "]" << std::endl;
|
||||
m_config.stream << "]" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -269,20 +269,20 @@ namespace Catch {
|
|||
|
||||
void StartSpansLazily() {
|
||||
if( !m_testingSpan.emitted ) {
|
||||
if( m_config.getName().empty() )
|
||||
m_config.stream() << "[Started testing]" << std::endl;
|
||||
if( m_config.name.empty() )
|
||||
m_config.stream << "[Started testing]" << std::endl;
|
||||
else
|
||||
m_config.stream() << "[Started testing: " << m_config.getName() << "]" << std::endl;
|
||||
m_config.stream << "[Started testing: " << m_config.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_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_config.stream << std::endl << "[Running: " << m_testSpan.name << "]" << std::endl;
|
||||
m_testSpan.emitted = true;
|
||||
}
|
||||
|
||||
|
|
@ -290,7 +290,7 @@ namespace Catch {
|
|||
SpanInfo& sectionSpan = m_sectionSpans.back();
|
||||
if( !sectionSpan.emitted && !sectionSpan.name.empty() ) {
|
||||
if( m_firstSectionInTestCase ) {
|
||||
m_config.stream() << "\n";
|
||||
m_config.stream << "\n";
|
||||
m_firstSectionInTestCase = false;
|
||||
}
|
||||
std::vector<SpanInfo>::iterator it = m_sectionSpans.begin();
|
||||
|
|
@ -298,7 +298,7 @@ namespace Catch {
|
|||
for(; it != itEnd; ++it ) {
|
||||
SpanInfo& prevSpan = *it;
|
||||
if( !prevSpan.emitted && !prevSpan.name.empty() ) {
|
||||
m_config.stream() << "[Started section: '" << prevSpan.name << "']" << std::endl;
|
||||
m_config.stream << "[Started section: '" << prevSpan.name << "']" << std::endl;
|
||||
prevSpan.emitted = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -309,16 +309,16 @@ namespace Catch {
|
|||
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 << "]\n";
|
||||
m_config.stream << "[" << prefix << ": " << trimmed << "]\n";
|
||||
}
|
||||
else {
|
||||
m_config.stream() << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed
|
||||
m_config.stream << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed
|
||||
<< "\n[end of " << prefix << "] <<<<<<<<<<<<<<<<<<<<<<<<\n";
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
const IReporterConfig& m_config;
|
||||
ReporterConfig m_config;
|
||||
bool m_firstSectionInTestCase;
|
||||
|
||||
SpanInfo m_testingSpan;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue