3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-18 10:55:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed ShouldNegate to FalseTest

Browse Source
This commit is contained in:
Phil Nash
2014-05-29 08:00:20 +01:00
parent 10801c2876
commit be9fe76101
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/internal/catch_result_builder.hpp
View File

@@ -18,10 +18,6 @@
namespace Catch {
inline bool isFalseTest( int flags ) {
return ( flags & ResultDisposition::NegateResult ) != 0;
}
ResultBuilder::ResultBuilder( char const* macroName,
SourceLineInfo const& lineInfo,
char const* capturedExpression,
@@ -94,10 +90,12 @@ namespace Catch {
AssertionResultData data = m_data;
// Flip bool results if testFalse is set
if( m_exprComponents.testFalse && data.resultType == ResultWas::Ok )
data.resultType = ResultWas::ExpressionFailed;
else if( m_exprComponents.testFalse && data.resultType == ResultWas::ExpressionFailed )
data.resultType = ResultWas::Ok;
if( m_exprComponents.testFalse ) {
if( data.resultType == ResultWas::Ok )
data.resultType = ResultWas::ExpressionFailed;
else if( data.resultType == ResultWas::ExpressionFailed )
data.resultType = ResultWas::Ok;
}
data.message = m_stream.oss.str();
data.reconstructedExpression = reconstructExpression();