Small naming correction

This commit is contained in:
Phil Nash 2012-09-03 08:18:32 +01:00
parent deb3ced619
commit 625fc832ee
3 changed files with 29 additions and 6 deletions

View File

@ -129,12 +129,12 @@ namespace Catch {
} }
virtual void NoAssertionsInSection( const std::string& sectionName ) { virtual void NoAssertionsInSection( const std::string& sectionName ) {
StartSpansLazily(); startSpansLazily();
TextColour colour( TextColour::ResultError ); TextColour colour( TextColour::ResultError );
m_config.stream << "\nNo assertions in section, '" << sectionName << "'\n" << std::endl; m_config.stream << "\nNo assertions in section, '" << sectionName << "'\n" << std::endl;
} }
virtual void NoAssertionsInTestCase( const std::string& testName ) { virtual void NoAssertionsInTestCase( const std::string& testName ) {
StartSpansLazily(); startSpansLazily();
TextColour colour( TextColour::ResultError ); TextColour colour( TextColour::ResultError );
m_config.stream << "\nNo assertions in test case, '" << testName << "'\n" << std::endl; m_config.stream << "\nNo assertions in test case, '" << testName << "'\n" << std::endl;
} }
@ -163,7 +163,7 @@ namespace Catch {
if( !m_config.includeSuccessfulResults && resultInfo.getResultType() == ResultWas::Ok ) if( !m_config.includeSuccessfulResults && resultInfo.getResultType() == ResultWas::Ok )
return; return;
StartSpansLazily(); startSpansLazily();
if( !resultInfo.getFilename().empty() ) { if( !resultInfo.getFilename().empty() ) {
TextColour colour( TextColour::FileName ); TextColour colour( TextColour::FileName );
@ -245,12 +245,12 @@ namespace Catch {
const std::string& stdOut, const std::string& stdOut,
const std::string& stdErr ) { const std::string& stdErr ) {
if( !stdOut.empty() ) { if( !stdOut.empty() ) {
StartSpansLazily(); startSpansLazily();
streamVariableLengthText( "stdout", stdOut ); streamVariableLengthText( "stdout", stdOut );
} }
if( !stdErr.empty() ) { if( !stdErr.empty() ) {
StartSpansLazily(); startSpansLazily();
streamVariableLengthText( "stderr", stdErr ); streamVariableLengthText( "stderr", stdErr );
} }
@ -263,7 +263,7 @@ namespace Catch {
private: // helpers private: // helpers
void StartSpansLazily() { void startSpansLazily() {
if( !m_testingSpan.emitted ) { if( !m_testingSpan.emitted ) {
if( m_config.name.empty() ) if( m_config.name.empty() )
m_config.stream << "[Started testing]" << std::endl; m_config.stream << "[Started testing]" << std::endl;

View File

@ -0,0 +1,9 @@
//
// File.cpp
// CatchSelfTest
//
// Created by Phil Nash on 02/09/2012.
//
//
#include "File.h"

View File

@ -0,0 +1,14 @@
//
// File.h
// CatchSelfTest
//
// Created by Phil Nash on 02/09/2012.
//
//
#ifndef __CatchSelfTest__File__
#define __CatchSelfTest__File__
#include <iostream>
#endif /* defined(__CatchSelfTest__File__) */