diff options
| author | Phil Nash | 2012-10-09 11:59:11 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-10-09 11:59:11 +0100 |
| commit | 71edf8b727977a8a0f8e2fa3562fa5bef295709a (patch) | |
| tree | 9bf3bc5c8dfad2005a7d479db805ee4c05d52ca1 /include/internal | |
| parent | 6730512afa7f5e40abf91868bc1d8ec114e13523 (diff) | |
| download | catch3-71edf8b727977a8a0f8e2fa3562fa5bef295709a.tar.gz | |
isNot -> isFalse
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/catch_capture.hpp | 12 | ||||
| -rw-r--r-- | include/internal/catch_expression_builder.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_resultinfo_builder.h | 4 | ||||
| -rw-r--r-- | include/internal/catch_resultinfo_builder.hpp | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 48164836..381c0dd0 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -62,9 +62,9 @@ inline bool isTrue( bool value ){ return value; } } /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_TEST( expr, isNot, stopOnFailure, macroName ) \ +#define INTERNAL_CATCH_TEST( expr, isFalse, stopOnFailure, macroName ) \ do { try { \ - INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr, isNot )->*expr ), stopOnFailure, expr ); \ + INTERNAL_CATCH_ACCEPT_EXPR( ( Catch::ExpressionBuilder( CATCH_INTERNAL_LINEINFO, macroName, #expr, isFalse )->*expr ), stopOnFailure, expr ); \ } catch( Catch::TestFailureException& ) { \ throw; \ } catch( ... ) { \ @@ -73,13 +73,13 @@ inline bool isTrue( bool value ){ return value; } } } while( Catch::isTrue( false ) ) /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_IF( expr, isNot, stopOnFailure, macroName ) \ - INTERNAL_CATCH_TEST( expr, isNot, stopOnFailure, macroName ); \ +#define INTERNAL_CATCH_IF( expr, isFalse, stopOnFailure, macroName ) \ + INTERNAL_CATCH_TEST( expr, isFalse, stopOnFailure, macroName ); \ if( Catch::getCurrentContext().getResultCapture().getLastResult()->ok() ) /////////////////////////////////////////////////////////////////////////////// -#define INTERNAL_CATCH_ELSE( expr, isNot, stopOnFailure, macroName ) \ - INTERNAL_CATCH_TEST( expr, isNot, stopOnFailure, macroName ); \ +#define INTERNAL_CATCH_ELSE( expr, isFalse, stopOnFailure, macroName ) \ + INTERNAL_CATCH_TEST( expr, isFalse, stopOnFailure, macroName ); \ if( !Catch::getCurrentContext().getResultCapture().getLastResult()->ok() ) /////////////////////////////////////////////////////////////////////////////// diff --git a/include/internal/catch_expression_builder.hpp b/include/internal/catch_expression_builder.hpp index 1082fb91..45a7664c 100644 --- a/include/internal/catch_expression_builder.hpp +++ b/include/internal/catch_expression_builder.hpp @@ -25,12 +25,12 @@ public: ExpressionBuilder( const SourceLineInfo& lineInfo, const char* macroName, const char* expr = "", - bool isNot = false ) + bool isFalse = false ) : m_messageStream() { m_result .setCapturedExpression( expr ) - .setIsFalse( isNot ) + .setIsFalse( isFalse ) .setLineInfo( lineInfo ) .setMacroName( macroName ); } diff --git a/include/internal/catch_resultinfo_builder.h b/include/internal/catch_resultinfo_builder.h index 8bc66e3e..83b6b6d7 100644 --- a/include/internal/catch_resultinfo_builder.h +++ b/include/internal/catch_resultinfo_builder.h @@ -44,13 +44,13 @@ public: STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( const RhsT& ); bool getIsFalse() const { - return m_isNot; + return m_isFalse; } private: ResultData m_data; std::string m_lhs, m_rhs, m_op; - bool m_isNot; + bool m_isFalse; }; template<Internal::Operator Op, typename T1, typename T2> diff --git a/include/internal/catch_resultinfo_builder.hpp b/include/internal/catch_resultinfo_builder.hpp index 28049e7c..4da4d5d2 100644 --- a/include/internal/catch_resultinfo_builder.hpp +++ b/include/internal/catch_resultinfo_builder.hpp @@ -15,10 +15,10 @@ namespace Catch { ResultInfoBuilder::ResultInfoBuilder() {} ResultInfoBuilder& ResultInfoBuilder::setResultType( ResultWas::OfType result ) { - // Flip bool results if isNot is set - if( m_isNot && result == ResultWas::Ok ) + // Flip bool results if isFalse is set + if( m_isFalse && result == ResultWas::Ok ) m_data.resultType = ResultWas::ExpressionFailed; - else if( m_isNot && result == ResultWas::ExpressionFailed ) + else if( m_isFalse && result == ResultWas::ExpressionFailed ) m_data.resultType = ResultWas::Ok; else m_data.resultType = result; @@ -29,7 +29,7 @@ namespace Catch { return *this; } ResultInfoBuilder& ResultInfoBuilder::setIsFalse( bool isFalse ) { - m_isNot = isFalse; + m_isFalse = isFalse; return *this; } @@ -67,7 +67,7 @@ namespace Catch { { ResultData data = m_data; data.reconstructedExpression = reconstructExpression(); - if( m_isNot ) { + if( m_isFalse ) { if( m_op == "" ) { data.capturedExpression = "!" + data.capturedExpression; data.reconstructedExpression = "!" + data.reconstructedExpression; |