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 AssertionHandler into INTERNAL_CATCH_MSG

Browse Source
This commit is contained in:
Phil Nash
2017-08-08 20:17:09 +01:00
parent 8a97beece2
commit 5f91724368
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/internal/catch_assertionhandler.cpp
View File

@@ -59,8 +59,22 @@ namespace Catch {
getCurrentContext().getResultCapture()->assertionStarting( m_assertionInfo );
}
void AssertionHandler::handle( ResultWas::OfType resultType, ITransientExpression const* expr, bool negated ) {
void AssertionHandler::handle( ITransientExpression const& expr ) {
bool negated = isFalseTest( m_assertionInfo.resultDisposition );
bool result = expr.getResult() != negated;
handle( result ? ResultWas::Ok : ResultWas::ExpressionFailed, &expr, negated );
}
void AssertionHandler::handle( ResultWas::OfType resultType ) {
handle( resultType, nullptr, false );
}
void AssertionHandler::handle( ResultWas::OfType resultType, StringRef const& message ) {
AssertionResultData data( resultType, LazyExpression( false ) );
data.message = message.c_str();
handle( data, nullptr );
}
void AssertionHandler::handle( ResultWas::OfType resultType, ITransientExpression const* expr, bool negated ) {
AssertionResultData data( resultType, LazyExpression( negated ) );
handle( data, expr );
}
@@ -80,16 +94,7 @@ namespace Catch {
(m_assertionInfo.resultDisposition & ResultDisposition::Normal);
}
}
void AssertionHandler::handle( ITransientExpression const& expr ) {
bool negated = isFalseTest( m_assertionInfo.resultDisposition );
bool result = expr.getResult() != negated;
handle( result ? ResultWas::Ok : ResultWas::ExpressionFailed, &expr, negated );
}
void AssertionHandler::handle( ResultWas::OfType resultType ) {
handle( resultType, nullptr, false );
}
auto AssertionHandler::allowThrows() const -> bool {
return getCurrentContext().getConfig()->allowThrows();
}
@@ -117,12 +122,7 @@ namespace Catch {
useActiveException();
}
void AssertionHandler::useActiveException() {
bool negated = isFalseTest( m_assertionInfo.resultDisposition );
AssertionResultData data( ResultWas::ThrewException, LazyExpression( negated ) );
data.message = Catch::translateActiveException();
handle( data, nullptr );
handle( ResultWas::ThrewException, Catch::translateActiveException().c_str() );
}
} // namespace Catch