feedc0de/Catch2
1
0
Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Fully removed Context class

Browse Source 
- responsibilities subsumed by RunContext
This commit is contained in:
Phil Nash
2015-11-19 18:30:03 +00:00
parent eea9357284
commit fdc8a2b2df
12 changed files with 54 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/internal/catch_result_builder.hpp
+4 -4
View File
@@ -9,7 +9,6 @@
#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED
#include "catch_result_builder.h"
#include "catch_context.h"
#include "catch_interfaces_config.h"
#include "catch_interfaces_capture.h"
#include "catch_interfaces_registry_hub.h"
@@ -97,12 +96,13 @@ namespace Catch {
}
void ResultBuilder::handleResult( AssertionResult const& result )
{
getCurrentRunContext().assertionEnded( result );
IRunContext& context = getCurrentRunContext();
context.assertionEnded( result );
if( !result.isOk() ) {
if( getCurrentConfig()->shouldDebugBreak() )
if( context.config().shouldDebugBreak() )
m_shouldDebugBreak = true;
if( getCurrentContext().getCurrentRunContext()->isAborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) )
if( context.isAborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) )
m_shouldThrow = true;
}
}