3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-03 21:49:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored duplicated code between acceptExpression() and acceptResult()

Browse Source
This commit is contained in:
Phil Nash
2011-03-15 18:01:44 +00:00
parent 4890a1d80a
commit 3eb41eed6d
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
internal/catch_runner_impl.hpp
View File

@@ -406,17 +406,7 @@ namespace Catch
) )
{ {
m_currentResult.setResultType( result ); m_currentResult.setResultType( result );
testEnded( m_currentResult ); return actOnCurrentResult();
bool ok = m_currentResult.ok();
m_currentResult = MutableResultInfo();
if( ok )
return ResultAction::None;
else if( shouldDebugBreak() )
return ResultAction::DebugFailed;
else
return ResultAction::Failed;
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@@ -426,16 +416,7 @@ namespace Catch
) )
{ {
m_currentResult = resultInfo; m_currentResult = resultInfo;
testEnded( m_currentResult ); return actOnCurrentResult();
bool ok = m_currentResult.ok();
m_currentResult = MutableResultInfo();
if( ok )
return ResultAction::None;
else if( shouldDebugBreak() )
return ResultAction::DebugFailed;
else
return ResultAction::Failed;
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@@ -544,6 +525,22 @@ namespace Catch
private: private:
///////////////////////////////////////////////////////////////////////////
ResultAction::Value actOnCurrentResult
()
{
testEnded( m_currentResult );
bool ok = m_currentResult.ok();
m_currentResult = MutableResultInfo();
if( ok )
return ResultAction::None;
else if( shouldDebugBreak() )
return ResultAction::DebugFailed;
else
return ResultAction::Failed;
}
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
void runCurrentTest void runCurrentTest
( (