print messages when unexpected exceptions are thrown

This commit is contained in:
dvirtz
2017-03-31 01:06:35 +03:00
committed by Martin Hořeňovský
parent 6e091d3991
commit 9a07dde16d
3 changed files with 24 additions and 2 deletions

View File

@@ -38,7 +38,10 @@ namespace Catch {
{}
ScopedMessage::~ScopedMessage() {
getResultCapture().popScopedMessage( m_info );
if (!std::uncaught_exception())
{
getResultCapture().popScopedMessage(m_info);
}
}

View File

@@ -138,7 +138,11 @@ namespace Catch {
case ResultWas::ThrewException:
colour = Colour::Error;
passOrFail = "FAILED";
messageLabel = "due to unexpected exception with message";
messageLabel = "due to unexpected exception with ";
if (_stats.infoMessages.size() == 1)
messageLabel += "message";
if (_stats.infoMessages.size() > 1)
messageLabel += "messages";
break;
case ResultWas::FatalErrorCondition:
colour = Colour::Error;