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

More AssertionResult refactoring

Browse Source
This commit is contained in:
Phil Nash
2012-10-24 21:59:47 +01:00
parent 1dd56d4d2b
commit e04e74f896
12 changed files with 95 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/reporters/catch_reporter_basic.hpp
View File

@@ -165,9 +165,9 @@ namespace Catch {
startSpansLazily();
if( !assertionResult.getFilename().empty() ) {
if( !assertionResult.getSourceInfo().empty() ) {
TextColour colour( TextColour::FileName );
m_config.stream << SourceLineInfo( assertionResult.getFilename(), assertionResult.getLine() );
m_config.stream << assertionResult.getSourceInfo();
}
if( assertionResult.hasExpression() ) {

2
include/reporters/catch_reporter_junit.hpp
View File

@@ -104,7 +104,7 @@ namespace Catch {
std::ostringstream oss;
if( !assertionResult.getMessage().empty() )
oss << assertionResult.getMessage() << " at ";
oss << SourceLineInfo( assertionResult.getFilename(), assertionResult.getLine() );
oss << assertionResult.getSourceInfo();
stats.m_content = oss.str();
stats.m_message = assertionResult.getExpandedExpression();
stats.m_resultType = assertionResult.getTestMacroName();

8
include/reporters/catch_reporter_xml.hpp
View File

@@ -82,8 +82,8 @@ namespace Catch {
if( assertionResult.hasExpression() ) {
m_xml.startElement( "Expression" )
.writeAttribute( "success", assertionResult.ok() )
.writeAttribute( "filename", assertionResult.getFilename() )
.writeAttribute( "line", assertionResult.getLine() );
.writeAttribute( "filename", assertionResult.getSourceInfo().file )
.writeAttribute( "line", assertionResult.getSourceInfo().line );
m_xml.scopedElement( "Original" )
.writeText( assertionResult.getExpression() );
@@ -95,8 +95,8 @@ namespace Catch {
switch( assertionResult.getResultType() ) {
case ResultWas::ThrewException:
m_xml.scopedElement( "Exception" )
.writeAttribute( "filename", assertionResult.getFilename() )
.writeAttribute( "line", assertionResult.getLine() )
.writeAttribute( "filename", assertionResult.getSourceInfo().file )
.writeAttribute( "line", assertionResult.getSourceInfo().line )
.writeText( assertionResult.getMessage() );
m_currentTestSuccess = false;
break;