3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-26 15:26:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Integrated new AssertionHandler into unexpected exception handling in RunContext

Browse Source
This commit is contained in:
Phil Nash 2017-08-09 08:49:59 +01:00
parent 201028d6ec
commit 7df290dfc1
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/internal/catch_run_context.cpp
View File

@ -270,7 +270,11 @@ namespace Catch {
// Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
// are reported without translation at the point of origin. // are reported without translation at the point of origin.
if (m_shouldReportUnexpected) { if (m_shouldReportUnexpected) {
makeUnexpectedResultBuilder().useActiveException(); AssertionHandler
( m_lastAssertionInfo.macroName,
m_lastAssertionInfo.lineInfo,
m_lastAssertionInfo.capturedExpression,
m_lastAssertionInfo.resultDisposition ).useActiveException();
} }
} }
m_testCaseTracker->close(); m_testCaseTracker->close();
@ -296,13 +300,6 @@ namespace Catch {
fatalConditionHandler.reset(); fatalConditionHandler.reset();
} }
ResultBuilder RunContext::makeUnexpectedResultBuilder() const {
return ResultBuilder(m_lastAssertionInfo.macroName,
m_lastAssertionInfo.lineInfo,
m_lastAssertionInfo.capturedExpression,
m_lastAssertionInfo.resultDisposition);
}
void RunContext::handleUnfinishedSections() { void RunContext::handleUnfinishedSections() {
// If sections ended prematurely due to an exception we stored their // If sections ended prematurely due to an exception we stored their
// infos here so we can tear them down outside the unwind process. // infos here so we can tear them down outside the unwind process.

2
include/internal/catch_run_context.hpp
View File

@ -103,8 +103,6 @@ namespace Catch {
private: private:
ResultBuilder makeUnexpectedResultBuilder() const;
void handleUnfinishedSections(); void handleUnfinishedSections();
TestRunInfo m_runInfo; TestRunInfo m_runInfo;