eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-25 14:09:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Collect assertion info up front

Browse source
This commit is contained in:
Phil Nash 2012-10-17 08:14:22 +01:00
parent a5fa78284d
commit c96f9330a0
7 changed files with 59 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/internal/catch_runner_impl.hpp
View file

@ -131,6 +131,9 @@ namespace Catch {
private: // IResultCapture
virtual void acceptAssertionInfo( const AssertionInfo& assertionInfo ) {
m_assertionInfo = assertionInfo;
}
virtual ResultAction::Value acceptResult( bool result ) {
return acceptResult( result ? ResultWas::Ok : ResultWas::ExpressionFailed );
}
@ -242,10 +245,16 @@ namespace Catch {
private:
ResultAction::Value actOnCurrentResult() {
m_currentResult
.setMacroName( m_assertionInfo.macroName )
.setLineInfo( m_assertionInfo.lineInfo )
.setCapturedExpression( m_assertionInfo.capturedExpression );
m_lastResult = m_currentResult.build();
testEnded( m_lastResult );
m_currentResult = AssertionResultBuilder();
m_assertionInfo = AssertionInfo();
ResultAction::Value action = ResultAction::None;
@ -304,6 +313,7 @@ namespace Catch {
IRunner* m_prevRunner;
IResultCapture* m_prevResultCapture;
const IConfig* m_prevConfig;
AssertionInfo m_assertionInfo;
};
} // end namespace Catch