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

Integrated INTERNAL_CATCH_THROWS_STR_MATCHES with new AssertionHandler

Browse Source
This commit is contained in:
Phil Nash
2017-08-09 00:44:30 +01:00
parent ef4fa56b71
commit 27fd8f80bd
9 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_assertionhandler.cpp
View File

@@ -13,6 +13,7 @@
#include "catch_context.h"
#include "catch_debugger.h"
#include "catch_interfaces_registry_hub.h"
#include "catch_matchers_string.h"
#include <cassert>
@@ -140,5 +141,14 @@ namespace Catch {
m_inExceptionGuard = false;
}
using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString ) {
MatchExpr<std::string, StringMatcher const&> expr( Catch::translateActiveException(), matcher, matcherString );
handler.handle( expr );
}
void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef matcherString ) {
handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
}
} // namespace Catch