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

ResultInfo -> AssertionResult filenames and variables

Browse Source
This commit is contained in:
Phil Nash
2012-10-16 08:31:05 +01:00
parent d16955f63a
commit c597a893fa
15 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
projects/SelfTest/catch_self_test.cpp
View File

@@ -31,11 +31,11 @@ namespace Catch{
return totals;
}
void MockReporter::Result( const AssertionResult& resultInfo ) {
if( resultInfo.getResultType() == ResultWas::Ok )
void MockReporter::Result( const AssertionResult& assertionResult ) {
if( assertionResult.getResultType() == ResultWas::Ok )
return;
switch( resultInfo.getResultType() ) {
switch( assertionResult.getResultType() ) {
case ResultWas::Info:
m_log << "Info";
break;
@@ -70,14 +70,14 @@ namespace Catch{
break;
}
if( resultInfo.hasExpression() )
m_log << resultInfo.getExpression();
if( assertionResult.hasExpression() )
m_log << assertionResult.getExpression();
if( resultInfo.hasMessage() )
m_log << "'" << resultInfo.getMessage() << "'";
if( assertionResult.hasMessage() )
m_log << "'" << assertionResult.getMessage() << "'";
if( resultInfo.hasExpandedExpression() )
m_log << resultInfo.getExpandedExpression();
if( assertionResult.hasExpandedExpression() )
m_log << assertionResult.getExpandedExpression();
}
void MockReporter::openLabel( const std::string& label, const std::string& arg ) {

2
projects/SelfTest/catch_self_test.hpp
View File

@@ -95,7 +95,7 @@ namespace Catch {
closeLabel( recordTestCases, testInfo.getName() );
}
virtual void Result( const AssertionResult& resultInfo );
virtual void Result( const AssertionResult& assertionResult );
private: