2010-11-10 00:24:00 +01:00
|
|
|
/*
|
|
|
|
* Created by Phil on 28/10/2010.
|
|
|
|
* Copyright 2010 Two Blue Cubes Ltd. 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_BASIC_HPP_INCLUDED
|
|
|
|
#define TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
|
|
|
|
|
2011-06-02 09:49:47 +02:00
|
|
|
#include "../internal/catch_capture.hpp"
|
|
|
|
#include "../internal/catch_interfaces_reporter.h"
|
|
|
|
#include "../internal/catch_reporter_registrars.hpp"
|
2012-02-25 21:36:22 +01:00
|
|
|
#include "../internal/catch_console_colour.hpp"
|
2010-11-10 00:24:00 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
namespace Catch {
|
|
|
|
|
|
|
|
class BasicReporter : public SharedImpl<IReporter> {
|
|
|
|
|
|
|
|
struct SpanInfo {
|
2012-08-13 08:46:10 +02:00
|
|
|
|
2011-02-09 20:26:59 +01:00
|
|
|
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;
|
|
|
|
};
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2010-11-10 00:24:00 +01:00
|
|
|
public:
|
2012-07-20 20:07:42 +02:00
|
|
|
BasicReporter( const ReporterConfig& config )
|
2011-12-28 11:28:56 +01:00
|
|
|
: m_config( config ),
|
2012-06-01 20:40:27 +02:00
|
|
|
m_firstSectionInTestCase( true ),
|
|
|
|
m_aborted( false )
|
2012-05-16 15:53:59 +02:00
|
|
|
{}
|
2012-08-13 08:46:10 +02:00
|
|
|
|
|
|
|
virtual ~BasicReporter();
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
static std::string getDescription() {
|
2010-11-10 00:24:00 +01:00
|
|
|
return "Reports test results as lines of text";
|
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2010-11-29 20:40:44 +01:00
|
|
|
private:
|
2012-02-25 10:39:13 +01:00
|
|
|
|
2012-06-01 20:40:27 +02:00
|
|
|
void ReportCounts( const std::string& label, const Counts& counts, const std::string& allPrefix = "All " ) {
|
2012-02-25 21:36:22 +01:00
|
|
|
if( counts.passed )
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << counts.failed << " of " << counts.total() << " " << label << "s failed";
|
2010-11-29 20:40:44 +01:00
|
|
|
else
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << ( counts.failed > 1 ? allPrefix : "" ) << pluralise( counts.failed, label ) << " failed";
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-06-01 20:40:27 +02:00
|
|
|
void ReportCounts( const Totals& totals, const std::string& allPrefix = "All " ) {
|
2012-05-16 15:53:59 +02:00
|
|
|
if( totals.assertions.total() == 0 ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "No tests ran";
|
2012-02-25 10:39:13 +01:00
|
|
|
}
|
2012-05-16 15:53:59 +02:00
|
|
|
else if( totals.assertions.failed ) {
|
2013-04-05 08:47:36 +02:00
|
|
|
Colour colour( Colour::ResultError );
|
2012-06-01 20:40:27 +02:00
|
|
|
ReportCounts( "test case", totals.testCases, allPrefix );
|
2012-05-16 15:53:59 +02:00
|
|
|
if( totals.testCases.failed > 0 ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " (";
|
2012-06-01 20:40:27 +02:00
|
|
|
ReportCounts( "assertion", totals.assertions, allPrefix );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << ")";
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
|
|
|
}
|
2012-05-16 15:53:59 +02:00
|
|
|
else {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ResultSuccess );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << allPrefix << "tests passed ("
|
2012-07-20 19:47:45 +02:00
|
|
|
<< pluralise( totals.assertions.passed, "assertion" ) << " in "
|
2012-03-04 12:14:21 +01:00
|
|
|
<< pluralise( totals.testCases.passed, "test case" ) << ")";
|
2012-02-25 10:39:13 +01:00
|
|
|
}
|
2012-02-24 09:59:35 +01:00
|
|
|
}
|
2010-11-29 20:40:44 +01:00
|
|
|
|
2012-02-25 21:36:22 +01:00
|
|
|
private: // IReporter
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual bool shouldRedirectStdout() const {
|
2012-02-17 10:28:21 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual void StartTesting() {
|
2011-02-09 20:26:59 +01:00
|
|
|
m_testingSpan = SpanInfo();
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
|
|
|
|
2012-06-01 20:40:27 +02:00
|
|
|
virtual void Aborted() {
|
|
|
|
m_aborted = true;
|
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual void EndTesting( const Totals& totals ) {
|
2011-03-15 19:42:22 +01:00
|
|
|
// Output the overall test results even if "Started Testing" was not emitted
|
2012-06-01 20:40:27 +02:00
|
|
|
if( m_aborted ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\n[Testing aborted. ";
|
2012-06-01 20:40:27 +02:00
|
|
|
ReportCounts( totals, "The first " );
|
|
|
|
}
|
|
|
|
else {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\n[Testing completed. ";
|
2012-06-01 20:40:27 +02:00
|
|
|
ReportCounts( totals );
|
|
|
|
}
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "]\n" << std::endl;
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual void StartGroup( const std::string& groupName ) {
|
2011-02-09 20:26:59 +01:00
|
|
|
m_groupSpan = groupName;
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual void EndGroup( const std::string& groupName, const Totals& totals ) {
|
|
|
|
if( m_groupSpan.emitted && !groupName.empty() ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[End of group: '" << groupName << "'. ";
|
2012-02-24 09:59:35 +01:00
|
|
|
ReportCounts( totals );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "]\n" << std::endl;
|
2011-02-09 20:26:59 +01:00
|
|
|
m_groupSpan = SpanInfo();
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
|
2012-11-25 12:19:55 +01:00
|
|
|
virtual void StartTestCase( const TestCaseInfo& testInfo ) {
|
|
|
|
m_testSpan = testInfo.name;
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual void StartSection( const std::string& sectionName, const std::string& ) {
|
2011-02-28 09:18:52 +01:00
|
|
|
m_sectionSpans.push_back( SpanInfo( sectionName ) );
|
2010-11-29 20:40:44 +01:00
|
|
|
}
|
2012-08-31 09:10:36 +02:00
|
|
|
|
|
|
|
virtual void NoAssertionsInSection( const std::string& sectionName ) {
|
2012-09-03 09:18:32 +02:00
|
|
|
startSpansLazily();
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ResultError );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\nNo assertions in section, '" << sectionName << "'\n" << std::endl;
|
2012-08-31 09:10:36 +02:00
|
|
|
}
|
|
|
|
virtual void NoAssertionsInTestCase( const std::string& testName ) {
|
2012-09-03 09:18:32 +02:00
|
|
|
startSpansLazily();
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ResultError );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\nNo assertions in test case, '" << testName << "'\n" << std::endl;
|
2012-08-31 09:10:36 +02:00
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
virtual void EndSection( const std::string& sectionName, const Counts& assertions ) {
|
2012-08-28 09:20:18 +02:00
|
|
|
|
2011-02-28 09:18:52 +01:00
|
|
|
SpanInfo& sectionSpan = m_sectionSpans.back();
|
2012-05-16 15:53:59 +02:00
|
|
|
if( sectionSpan.emitted && !sectionSpan.name.empty() ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[End of section: '" << sectionName << "' ";
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
if( assertions.failed ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ResultError );
|
2012-02-25 21:36:22 +01:00
|
|
|
ReportCounts( "assertion", assertions);
|
|
|
|
}
|
2012-05-16 15:53:59 +02:00
|
|
|
else {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ResultSuccess );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << ( assertions.passed > 1 ? "All " : "" )
|
2012-07-20 19:47:45 +02:00
|
|
|
<< pluralise( assertions.passed, "assertion" ) << " passed" ;
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "]\n" << std::endl;
|
2011-02-09 20:26:59 +01:00
|
|
|
}
|
2011-02-28 09:18:52 +01:00
|
|
|
m_sectionSpans.pop_back();
|
2010-11-10 00:24:00 +01:00
|
|
|
}
|
|
|
|
|
2012-10-16 09:31:05 +02:00
|
|
|
virtual void Result( const AssertionResult& assertionResult ) {
|
2013-05-28 19:39:32 +02:00
|
|
|
if( !m_config.fullConfig()->includeSuccessfulResults() && assertionResult.getResultType() == ResultWas::Ok )
|
2010-11-10 00:24:00 +01:00
|
|
|
return;
|
|
|
|
|
2012-09-03 09:18:32 +02:00
|
|
|
startSpansLazily();
|
2011-02-09 20:26:59 +01:00
|
|
|
|
2012-10-24 22:59:47 +02:00
|
|
|
if( !assertionResult.getSourceInfo().empty() ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::FileName );
|
2013-01-13 22:51:44 +01:00
|
|
|
m_config.stream() << assertionResult.getSourceInfo() << ": ";
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
|
2012-10-16 09:31:05 +02:00
|
|
|
if( assertionResult.hasExpression() ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::OriginalExpression );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << assertionResult.getExpression();
|
2012-11-13 10:44:52 +01:00
|
|
|
if( assertionResult.succeeded() ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour successColour( Colour::Success );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " succeeded";
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
2012-05-16 15:53:59 +02:00
|
|
|
else {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour errorColour( Colour::Error );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " failed";
|
2012-11-13 10:44:52 +01:00
|
|
|
if( assertionResult.isOk() ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour okAnywayColour( Colour::Success );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " - but was ok";
|
2012-11-13 10:44:52 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
}
|
2012-10-16 09:31:05 +02:00
|
|
|
switch( assertionResult.getResultType() ) {
|
2010-11-10 00:24:00 +01:00
|
|
|
case ResultWas::ThrewException:
|
2012-10-31 19:04:22 +01:00
|
|
|
{
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::Error );
|
2012-10-31 19:04:22 +01:00
|
|
|
if( assertionResult.hasExpression() )
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " with unexpected";
|
2012-10-31 19:04:22 +01:00
|
|
|
else
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "Unexpected";
|
|
|
|
m_config.stream() << " exception with message: '" << assertionResult.getMessage() << "'";
|
2012-10-31 19:04:22 +01:00
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
break;
|
2011-03-14 20:21:35 +01:00
|
|
|
case ResultWas::DidntThrowException:
|
2012-10-31 19:04:22 +01:00
|
|
|
{
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::Error );
|
2012-10-31 19:04:22 +01:00
|
|
|
if( assertionResult.hasExpression() )
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " because no exception was thrown where one was expected";
|
2012-10-31 19:04:22 +01:00
|
|
|
else
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "No exception thrown where one was expected";
|
2012-10-31 19:04:22 +01:00
|
|
|
}
|
2011-03-14 20:21:35 +01:00
|
|
|
break;
|
2010-11-10 00:24:00 +01:00
|
|
|
case ResultWas::Info:
|
2012-10-31 19:04:22 +01:00
|
|
|
{
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ReconstructedExpression );
|
2012-10-31 19:04:22 +01:00
|
|
|
streamVariableLengthText( "info", assertionResult.getMessage() );
|
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
break;
|
|
|
|
case ResultWas::Warning:
|
2012-10-31 19:04:22 +01:00
|
|
|
{
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ReconstructedExpression );
|
2012-10-31 19:04:22 +01:00
|
|
|
streamVariableLengthText( "warning", assertionResult.getMessage() );
|
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
break;
|
|
|
|
case ResultWas::ExplicitFailure:
|
2012-10-31 19:04:22 +01:00
|
|
|
{
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::Error );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "failed with message: '" << assertionResult.getMessage() << "'";
|
2012-10-31 19:04:22 +01:00
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
break;
|
2011-09-29 09:58:40 +02:00
|
|
|
case ResultWas::Unknown: // These cases are here to prevent compiler warnings
|
|
|
|
case ResultWas::Ok:
|
|
|
|
case ResultWas::FailureBit:
|
|
|
|
case ResultWas::ExpressionFailed:
|
|
|
|
case ResultWas::Exception:
|
2012-10-16 09:31:05 +02:00
|
|
|
if( !assertionResult.hasExpression() ) {
|
2012-11-13 10:44:52 +01:00
|
|
|
if( assertionResult.succeeded() ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::Success );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " succeeded";
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
2012-05-16 15:53:59 +02:00
|
|
|
else {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::Error );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " failed";
|
2012-11-13 10:44:52 +01:00
|
|
|
if( assertionResult.isOk() ) {
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour okAnywayColour( Colour::Success );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " - but was ok";
|
2012-11-13 10:44:52 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
}
|
2011-03-14 20:21:35 +01:00
|
|
|
}
|
2012-11-21 09:49:20 +01:00
|
|
|
if( assertionResult.hasMessage() ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\n";
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ReconstructedExpression );
|
2012-11-21 09:49:20 +01:00
|
|
|
streamVariableLengthText( "with message", assertionResult.getMessage() );
|
|
|
|
}
|
2010-12-28 15:42:46 +01:00
|
|
|
break;
|
2010-11-10 00:24:00 +01:00
|
|
|
}
|
|
|
|
|
2012-10-16 09:31:05 +02:00
|
|
|
if( assertionResult.hasExpandedExpression() ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << " for: ";
|
2012-10-29 20:55:13 +01:00
|
|
|
if( assertionResult.getExpandedExpression().size() > 40 ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\n";
|
2012-10-29 20:55:13 +01:00
|
|
|
if( assertionResult.getExpandedExpression().size() < 70 )
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\t";
|
2012-10-29 20:55:13 +01:00
|
|
|
}
|
2013-04-05 08:59:28 +02:00
|
|
|
Colour colour( Colour::ReconstructedExpression );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << assertionResult.getExpandedExpression();
|
2010-11-10 00:24:00 +01:00
|
|
|
}
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << std::endl;
|
2010-11-10 00:24:00 +01:00
|
|
|
}
|
|
|
|
|
2012-11-25 12:19:55 +01:00
|
|
|
virtual void EndTestCase( const TestCaseInfo& testInfo,
|
2012-05-16 15:53:59 +02:00
|
|
|
const Totals& totals,
|
|
|
|
const std::string& stdOut,
|
|
|
|
const std::string& stdErr ) {
|
|
|
|
if( !stdOut.empty() ) {
|
2012-09-03 09:18:32 +02:00
|
|
|
startSpansLazily();
|
2011-04-11 09:30:47 +02:00
|
|
|
streamVariableLengthText( "stdout", stdOut );
|
2011-03-15 19:56:11 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !stdErr.empty() ) {
|
2012-09-03 09:18:32 +02:00
|
|
|
startSpansLazily();
|
2011-04-11 09:30:47 +02:00
|
|
|
streamVariableLengthText( "stderr", stdErr );
|
2011-03-15 19:56:11 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
if( m_testSpan.emitted ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[Finished: '" << testInfo.name << "' ";
|
2012-02-24 09:59:35 +01:00
|
|
|
ReportCounts( totals );
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "]" << std::endl;
|
2011-02-09 20:26:59 +01:00
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2011-02-09 20:26:59 +01:00
|
|
|
private: // helpers
|
|
|
|
|
2012-09-03 09:18:32 +02:00
|
|
|
void startSpansLazily() {
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !m_testingSpan.emitted ) {
|
2013-05-28 19:39:32 +02:00
|
|
|
if( m_config.fullConfig()->name().empty() )
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[Started testing]" << std::endl;
|
2011-04-12 09:07:39 +02:00
|
|
|
else
|
2013-05-28 19:39:32 +02:00
|
|
|
m_config.stream() << "[Started testing: " << m_config.fullConfig()->name() << "]" << std::endl;
|
2011-02-09 20:26:59 +01:00
|
|
|
m_testingSpan.emitted = true;
|
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !m_groupSpan.emitted && !m_groupSpan.name.empty() ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[Started group: '" << m_groupSpan.name << "']" << std::endl;
|
2011-02-09 20:26:59 +01:00
|
|
|
m_groupSpan.emitted = true;
|
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !m_testSpan.emitted ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << std::endl << "[Running: " << m_testSpan.name << "]" << std::endl;
|
2011-02-09 20:26:59 +01:00
|
|
|
m_testSpan.emitted = true;
|
|
|
|
}
|
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !m_sectionSpans.empty() ) {
|
2011-02-28 09:18:52 +01:00
|
|
|
SpanInfo& sectionSpan = m_sectionSpans.back();
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !sectionSpan.emitted && !sectionSpan.name.empty() ) {
|
|
|
|
if( m_firstSectionInTestCase ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\n";
|
2011-02-28 09:18:52 +01:00
|
|
|
m_firstSectionInTestCase = false;
|
|
|
|
}
|
|
|
|
std::vector<SpanInfo>::iterator it = m_sectionSpans.begin();
|
|
|
|
std::vector<SpanInfo>::iterator itEnd = m_sectionSpans.end();
|
2012-05-16 15:53:59 +02:00
|
|
|
for(; it != itEnd; ++it ) {
|
2011-02-28 09:18:52 +01:00
|
|
|
SpanInfo& prevSpan = *it;
|
2012-05-16 15:53:59 +02:00
|
|
|
if( !prevSpan.emitted && !prevSpan.name.empty() ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[Started section: '" << prevSpan.name << "']" << std::endl;
|
2011-02-28 09:18:52 +01:00
|
|
|
prevSpan.emitted = true;
|
|
|
|
}
|
|
|
|
}
|
2011-02-09 20:26:59 +01:00
|
|
|
}
|
2011-02-28 09:18:52 +01:00
|
|
|
}
|
2011-02-09 20:26:59 +01:00
|
|
|
}
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2012-05-16 15:53:59 +02:00
|
|
|
void streamVariableLengthText( const std::string& prefix, const std::string& text ) {
|
2011-04-11 09:30:47 +02:00
|
|
|
std::string trimmed = trim( text );
|
2012-05-16 15:53:59 +02:00
|
|
|
if( trimmed.find_first_of( "\r\n" ) == std::string::npos ) {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "[" << prefix << ": " << trimmed << "]";
|
2011-04-11 09:30:47 +02:00
|
|
|
}
|
2012-05-16 15:53:59 +02:00
|
|
|
else {
|
2012-11-27 00:28:00 +01:00
|
|
|
m_config.stream() << "\n[" << prefix << "] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" << trimmed
|
2012-02-25 21:36:22 +01:00
|
|
|
<< "\n[end of " << prefix << "] <<<<<<<<<<<<<<<<<<<<<<<<\n";
|
2011-04-11 09:30:47 +02:00
|
|
|
}
|
|
|
|
}
|
2010-11-10 00:24:00 +01:00
|
|
|
|
|
|
|
private:
|
2012-07-20 20:07:42 +02:00
|
|
|
ReporterConfig m_config;
|
2010-11-29 20:40:44 +01:00
|
|
|
bool m_firstSectionInTestCase;
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2011-02-09 20:26:59 +01:00
|
|
|
SpanInfo m_testingSpan;
|
|
|
|
SpanInfo m_groupSpan;
|
|
|
|
SpanInfo m_testSpan;
|
2011-02-28 09:18:52 +01:00
|
|
|
std::vector<SpanInfo> m_sectionSpans;
|
2012-06-01 20:40:27 +02:00
|
|
|
bool m_aborted;
|
2010-11-10 00:24:00 +01:00
|
|
|
};
|
2012-05-31 20:40:26 +02:00
|
|
|
|
2010-11-10 00:24:00 +01:00
|
|
|
} // end namespace Catch
|
2012-02-25 21:36:22 +01:00
|
|
|
|
2010-12-28 15:42:46 +01:00
|
|
|
#endif // TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
|