3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 12:55:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Console reporter is now the default

Browse Source
This commit is contained in:
Phil Nash
2012-12-10 08:54:57 +00:00
parent f4c0a1848d
commit bcad093af7
8 changed files with 613 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/catch_runner.hpp
View File

@@ -95,7 +95,7 @@ namespace Catch {
}
void makeReporter() {
std::string reporterName = m_config.reporter.empty()
? "basic"
? "console"
: m_config.reporter;
ReporterConfig reporterConfig( m_configWrapper.stream(), m_config );

2
include/internal/catch_version.hpp
View File

@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 0, 9, 9, "integration" );
Version libraryVersion( 0, 9, 10, "integration" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

50
include/reporters/catch_reporter_console.hpp
View File

@@ -35,36 +35,17 @@ namespace Catch {
}
void lazyPrintGroupInfo() {
if( !unusedGroupInfo->name.empty() )
// stream << "[Group: '" << unusedGroupInfo->name << "']" << std::endl;
stream << "[Started group: '" << unusedGroupInfo->name << "']" << std::endl;
stream << "[Group: '" << unusedGroupInfo->name << "']" << std::endl;
// stream << "[Started group: '" << unusedGroupInfo->name << "']" << std::endl;
unusedGroupInfo.reset();
}
void lazyPrintTestCaseInfo() {
// stream << "[Test case: '" << unusedTestCaseInfo->name << "']" << std::endl;
stream << "[Running: " << unusedTestCaseInfo->name << "]" << std::endl;
stream << "[Test case: '" << unusedTestCaseInfo->name << "']" << std::endl;
// stream << "[Running: " << unusedTestCaseInfo->name << "]" << std::endl;
unusedTestCaseInfo.reset();
}
std::string makeSectionPath( ThreadedSectionInfo const * section, std::string const& delimiter ) {
std::string sectionPath = "'" + section->name + "'";
// !TBD: Do this without the assignment in the while as it causes warnings:
while( ( section = section->parent.get() ) )
sectionPath = "'" + section->name + "'" + delimiter + sectionPath;
return sectionPath;
}
void lazyPrintSectionInfo() {
// !TBD use printed flag
ThreadedSectionInfo* section = unusedSectionInfo.get();
std::string sectionPath = makeSectionPath( section, ", " );
if( sectionPath.size() > 60 )
sectionPath = makeSectionPath( section, ",\n " );
stream << "[Section: " << sectionPath << "]" << std::endl;
unusedSectionInfo.reset();
}
void lazyPrintSectionInfoLegacy() {
void lazyPrintSectionInfo() {
std::vector<ThreadedSectionInfo*> sections;
for( ThreadedSectionInfo* section = unusedSectionInfo.get();
section && !section->printed;
@@ -73,7 +54,8 @@ namespace Catch {
typedef std::vector<ThreadedSectionInfo*>::const_reverse_iterator It;
for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it ) {
stream << "[Started section: " << "'" + (*it)->name + "'" << "]" << std::endl;
// stream << "[Started section: " << "'" + (*it)->name + "'" << "]" << std::endl;
stream << "[Section: " << "'" + (*it)->name + "'" << "]" << std::endl;
(*it)->printed = true;
}
unusedSectionInfo.reset();
@@ -86,7 +68,7 @@ namespace Catch {
if( unusedTestCaseInfo )
lazyPrintTestCaseInfo();
if( currentSectionInfo && !currentSectionInfo->printed )
lazyPrintSectionInfoLegacy(); // !TBD
lazyPrintSectionInfo();
}
virtual void assertionStarting( AssertionInfo const& ) {
@@ -248,8 +230,8 @@ namespace Catch {
stream << "\nNo assertions in section, '" << _sectionStats->sectionInfo.name << "'\n" << std::endl;
}
if( currentSectionInfo && currentSectionInfo->printed ) {
// stream << "[Summary for section '" << _sectionStats->sectionInfo.name << "': ";
stream << "[End of section: '" << _sectionStats->sectionInfo.name << "' ";
stream << "[Summary for section '" << _sectionStats->sectionInfo.name << "': ";
// stream << "[End of section: '" << _sectionStats->sectionInfo.name << "' ";
Counts const& assertions = _sectionStats->assertions;
if( assertions.failed ) {
TextColour colour( TextColour::ResultError );
@@ -271,8 +253,8 @@ namespace Catch {
stream << "\nNo assertions in test case, '" << _testCaseStats->testInfo.name << "'\n" << std::endl;
}
if( !unusedTestCaseInfo ) {
// stream << "[Summary for test case '" << _testCaseStats->testInfo.name << "': ";
stream << "[Finished: '" << _testCaseStats->testInfo.name << "' ";
stream << "[Summary for test case '" << _testCaseStats->testInfo.name << "': ";
// stream << "[Finished: '" << _testCaseStats->testInfo.name << "' ";
printTotals( _testCaseStats->totals );
stream << "]\n" << std::endl;
}
@@ -280,8 +262,8 @@ namespace Catch {
}
virtual void testGroupEnded( Ptr<TestGroupStats const> const& _testGroupStats ) {
if( !unusedGroupInfo ) {
// stream << "[Summary for group '" << _testGroupStats->groupInfo.name << "': ";
stream << "[End of group '" << _testGroupStats->groupInfo.name << "'. ";
stream << "[Summary for group '" << _testGroupStats->groupInfo.name << "': ";
// stream << "[End of group '" << _testGroupStats->groupInfo.name << "'. ";
printTotals( _testGroupStats->totals );
stream << "]\n" << std::endl;
}
@@ -289,8 +271,8 @@ namespace Catch {
}
virtual void testRunEnded( Ptr<TestRunStats const> const& _testRunStats ) {
if( !unusedTestCaseInfo ) {
// stream << "[Summary for '" << _testRunStats->runInfo.name << "': ";
stream << "[Testing completed. ";
stream << "[Summary for '" << _testRunStats->runInfo.name << "': ";
// stream << "[Testing completed. ";
printTotals( _testRunStats->totals );
stream << "]\n" << std::endl;
}