cheng/Catch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fmt and tag fixup for #876

Browse Source 
Github wouldn't let me push to the PR, probably because it was made from
fork of a fork...
This commit is contained in:
Martin Hořeňovský 2017-04-04 11:31:13 +02:00
parent 9a07dde16d
commit cdd83c2e15
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/internal/catch_message.hpp
View File

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

10
projects/SelfTest/ExceptionTests.cpp
View File

@ -210,17 +210,17 @@ TEST_CASE( "Mismatching exception messages failing the test", "[.][failing][!thr
REQUIRE_THROWS_WITH( thisThrows(), "expected exception" );
}
TEST_CASE( "#748 - captures with unexpected exceptions", "[!shouldfail]" ) {
TEST_CASE( "#748 - captures with unexpected exceptions", "[!shouldfail][!throws]" ) {
int answer = 42;
CAPTURE(answer);
CAPTURE( answer );
// the message should be printed on the first two sections but not on the third
SECTION( "outside assertions" ) {
thisThrows();
}
SECTION( "inside REQUIRE_NOTHROW" ) {
REQUIRE_NOTHROW(thisThrows());
REQUIRE_NOTHROW( thisThrows() );
}
SECTION( "inside REQUIRE_THROWS" ) {
REQUIRE_THROWS(thisThrows());
REQUIRE_THROWS( thisThrows() );
}
}
}