mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-30 09:13:29 +01:00
42d1b45386
commit70c5ef9eed
Author: Phil Nash <github@philnash.me> Date: Tue Nov 13 21:46:01 2012 +0000 Regen single include commit4ea535e505
Author: Phil Nash <github@philnash.me> Date: Tue Nov 13 09:56:30 2012 +0000 Tidied up result enums commit7717c29072
Author: Phil Nash <github@philnash.me> Date: Tue Nov 13 09:45:29 2012 +0000 Implemented CHECK_NOFAIL Previous commit missed some files commitd539da9030
Author: Phil Nash <github@philnash.me> Date: Tue Nov 13 09:44:52 2012 +0000 Implemented CHECK_NO_FAIL commitaf1a321860
Author: Phil Nash <github@philnash.me> Date: Sat Nov 10 18:46:39 2012 +0000 Regen single include commitf54ac5625e
Author: Phil Nash <github@philnash.me> Date: Sat Nov 10 18:44:12 2012 +0000 New (combined) baselines commitdefca58566
Author: Phil Nash <github@philnash.me> Date: Sat Nov 10 18:43:23 2012 +0000 negate() -> endExpression(), takes ResultDisposition commitb2ef998825
Author: Phil Nash <github@philnash.me> Date: Sat Nov 10 10:35:09 2012 +0000 Changed shouldNegate boolean to use part of ResultDisposition enum commit1af13dba97
Author: Phil Nash <github@philnash.me> Date: Sat Nov 10 10:20:08 2012 +0000 Changed StopOnFailure boolean to an enum commita1dc7e312c
Author: Phil Nash <github@philnash.me> Date: Tue Nov 6 19:34:35 2012 +0000 Regen single include commit20e59ce9d1
Author: Phil Nash <github@philnash.me> Date: Tue Nov 6 19:34:10 2012 +0000 Added tags docs commitb5b1b1e430
Author: Phil Nash <github@philnash.me> Date: Tue Nov 6 19:13:25 2012 +0000 Some expression/ evaluation clean-up commitec5956f471
Author: Phil Nash <github@philnash.me> Date: Tue Nov 6 07:52:28 2012 +0000 Fix for #134 The INTERNAL_CATCH_MSG macro, which is used by INFO, WARN and FAIL places its lines in a do…while block so it can be used after an if statement with no block commit88b70828f2
Author: Phil Nash <github@philnash.me> Date: Sun Nov 4 21:39:38 2012 +0000 Regen single include commitb323fc7e6c
Author: Phil Nash <github@philnash.me> Date: Sun Nov 4 21:39:16 2012 +0000 Fixed line/no regression for SECTIONs Unexpected exceptions within a section now get the SECTION's line no. again (instead of TEST_CASE line/no) commit78fba28c4b
Author: Phil Nash <github@philnash.me> Date: Sun Nov 4 21:11:59 2012 +0000 Added className to TestCaseInfo className is passed through from class based test methods and held in the TestCaseInfo. For free-function based test cases it is set to "global". The JUnit reporter uses the className value to populate he class attribute. commit81cb69ef18
Author: Phil Nash <github@philnash.me> Date: Sun Nov 4 21:09:22 2012 +0000 AssertionInfo captures more info (for test cases and sections) commita4e088c999
Author: Phil Nash <github@philnash.me> Date: Fri Nov 2 08:29:03 2012 +0000 Removed __FUNCTION__ from SourceLineInfo commit2a1e8bfc6e
Author: Phil Nash <github@philnash.me> Date: Thu Nov 1 08:16:15 2012 +0000 Updated colour comments commitf0f407fc3e
Author: Phil Nash <github@philnash.me> Date: Wed Oct 31 18:28:21 2012 +0000 Manually applied merge #133 from Master commit355b95fda1
Author: Phil Nash <github@philnash.me> Date: Wed Oct 31 18:04:22 2012 +0000 Cleaned up ANSI colour code impl a bit commit778f9c4fc7
Author: Phil Nash <github@philnash.me> Date: Tue Oct 30 09:09:30 2012 +0000 Removed "no-" from Wno-global-constructors when disabling commit5efa4bcb8a
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 20:49:22 2012 +0000 Regenerated single_include commit108f1937d8
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 20:46:45 2012 +0000 Added terminal colour codes for POSIX With thanks to Adam Strzelecki commit8f4cc541d5
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 19:55:34 2012 +0000 Added regression test baselines commit2e203a1834
Author: Phil Nash <github@philnash.me> Date: Mon Oct 29 19:55:13 2012 +0000 Fixed remaining reporting regressions commit134e45b3ad
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 20:57:21 2012 +0000 Fixed #132 commit2f92db9898
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 12:15:34 2012 +0000 Updated the readme specifically for the Integration branch commit82acc2ca05
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 12:07:17 2012 +0000 Regenerated single include commitfe1d7c1d08
Author: Phil Nash <github@philnash.me> Date: Sun Oct 28 10:27:44 2012 +0000 Small fixes and tweaks commit355b5e546d
Author: Phil Nash <github@philnash.me> Date: Fri Oct 26 09:05:36 2012 +0100 Some tidy-up commitf847186ebb
Author: Phil Nash <github@philnash.me> Date: Fri Oct 26 08:45:23 2012 +0100 AssertionResultBuilder -> ExpressionResultBuilder commit8cca2f1369
Author: Phil Nash <github@philnash.me> Date: Wed Oct 24 22:09:01 2012 +0100 ExpressionBuilder ->ExpressionDecomposer Expression -> ExpressionLhs commite04e74f896
Author: Phil Nash <github@philnash.me> Date: Wed Oct 24 21:59:47 2012 +0100 More AssertionResult refactoring commit1dd56d4d2b
Author: Phil Nash <github@philnash.me> Date: Fri Oct 19 08:01:34 2012 +0100 AssertionResultBuilder can be constructed from result type commitf2d5f1b3e4
Author: Phil Nash <github@philnash.me> Date: Fri Oct 19 08:01:05 2012 +0100 Expression has its own result builder - not passed in from expression builder commite3b111a39a
Author: Phil Nash <github@philnash.me> Date: Thu Oct 18 22:59:16 2012 +0100 streamlined acceptResult commit3ad13256e1
Author: Phil Nash <github@philnash.me> Date: Thu Oct 18 08:39:44 2012 +0100 Refactored assertion builder stuff out of expression builder commitc96f9330a0
Author: Phil Nash <github@philnash.me> Date: Wed Oct 17 08:14:22 2012 +0100 Collect assertion info up front commita5fa78284d
Author: Phil Nash <github@philnash.me> Date: Tue Oct 16 08:33:13 2012 +0100 ResultData -> AssertionResultData commitc597a893fa
Author: Phil Nash <github@philnash.me> Date: Tue Oct 16 08:31:05 2012 +0100 ResultInfo -> AssertionResult filenames and variables commitd16955f63a
Author: Phil Nash <github@philnash.me> Date: Tue Oct 16 08:27:21 2012 +0100 Renamed ResultInfo -> AssertionResult commit175da3ef64
Author: Phil Nash <github@philnash.me> Date: Fri Oct 12 18:39:22 2012 +0100 regen test 3
349 lines
14 KiB
C++
349 lines
14 KiB
C++
/*
|
|
* 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
|
|
|
|
#include "../internal/catch_capture.hpp"
|
|
#include "../internal/catch_interfaces_reporter.h"
|
|
#include "../internal/catch_reporter_registrars.hpp"
|
|
#include "../internal/catch_console_colour.hpp"
|
|
|
|
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 ) {
|
|
TextColour colour( TextColour::ResultError );
|
|
ReportCounts( "test case", totals.testCases, allPrefix );
|
|
if( totals.testCases.failed > 0 ) {
|
|
m_config.stream << " (";
|
|
ReportCounts( "assertion", totals.assertions, allPrefix );
|
|
m_config.stream << ")";
|
|
}
|
|
}
|
|
else {
|
|
TextColour colour( TextColour::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.getName();
|
|
}
|
|
|
|
virtual void StartSection( const std::string& sectionName, const std::string& ) {
|
|
m_sectionSpans.push_back( SpanInfo( sectionName ) );
|
|
}
|
|
|
|
virtual void NoAssertionsInSection( const std::string& sectionName ) {
|
|
startSpansLazily();
|
|
TextColour colour( TextColour::ResultError );
|
|
m_config.stream << "\nNo assertions in section, '" << sectionName << "'\n" << std::endl;
|
|
}
|
|
virtual void NoAssertionsInTestCase( const std::string& testName ) {
|
|
startSpansLazily();
|
|
TextColour colour( TextColour::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 ) {
|
|
TextColour colour( TextColour::ResultError );
|
|
ReportCounts( "assertion", assertions);
|
|
}
|
|
else {
|
|
TextColour colour( TextColour::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.includeSuccessfulResults && assertionResult.getResultType() == ResultWas::Ok )
|
|
return;
|
|
|
|
startSpansLazily();
|
|
|
|
if( !assertionResult.getSourceInfo().empty() ) {
|
|
TextColour colour( TextColour::FileName );
|
|
m_config.stream << assertionResult.getSourceInfo();
|
|
}
|
|
|
|
if( assertionResult.hasExpression() ) {
|
|
TextColour colour( TextColour::OriginalExpression );
|
|
m_config.stream << assertionResult.getExpression();
|
|
if( assertionResult.succeeded() ) {
|
|
TextColour successColour( TextColour::Success );
|
|
m_config.stream << " succeeded";
|
|
}
|
|
else {
|
|
TextColour errorColour( TextColour::Error );
|
|
m_config.stream << " failed";
|
|
if( assertionResult.isOk() ) {
|
|
TextColour okAnywayColour( TextColour::Success );
|
|
m_config.stream << " - but was ok";
|
|
}
|
|
}
|
|
}
|
|
switch( assertionResult.getResultType() ) {
|
|
case ResultWas::ThrewException:
|
|
{
|
|
TextColour colour( TextColour::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:
|
|
{
|
|
TextColour colour( TextColour::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:
|
|
{
|
|
TextColour colour( TextColour::ReconstructedExpression );
|
|
streamVariableLengthText( "info", assertionResult.getMessage() );
|
|
}
|
|
break;
|
|
case ResultWas::Warning:
|
|
{
|
|
TextColour colour( TextColour::ReconstructedExpression );
|
|
streamVariableLengthText( "warning", assertionResult.getMessage() );
|
|
}
|
|
break;
|
|
case ResultWas::ExplicitFailure:
|
|
{
|
|
TextColour colour( TextColour::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() ) {
|
|
TextColour colour( TextColour::Success );
|
|
m_config.stream << " succeeded";
|
|
}
|
|
else {
|
|
TextColour colour( TextColour::Error );
|
|
m_config.stream << " failed";
|
|
if( assertionResult.isOk() ) {
|
|
TextColour okAnywayColour( TextColour::Success );
|
|
m_config.stream << " - but was ok";
|
|
}
|
|
}
|
|
}
|
|
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";
|
|
}
|
|
TextColour colour( TextColour::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.getName() << "' ";
|
|
ReportCounts( totals );
|
|
m_config.stream << "]" << std::endl;
|
|
}
|
|
}
|
|
|
|
private: // helpers
|
|
|
|
void startSpansLazily() {
|
|
if( !m_testingSpan.emitted ) {
|
|
if( m_config.name.empty() )
|
|
m_config.stream << "[Started testing]" << std::endl;
|
|
else
|
|
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_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
|
|
|
|
#endif // TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
|