diff options
| author | Phil Nash | 2012-05-08 19:29:51 +0100 |
|---|---|---|
| committer | Phil Nash | 2012-05-08 19:29:51 +0100 |
| commit | b5d367206bc1b799fa7b96ab8453038421aaba3e (patch) | |
| tree | 5b8e73a3e978a0d8c6c134fba690cbf7188ecedd /include | |
| parent | 5d1c8f2c6d12f3e11a8fec9ee70d52593ee1c339 (diff) | |
| download | catch3-b5d367206bc1b799fa7b96ab8453038421aaba3e.tar.gz | |
Factored MutableResultInfo into its own file
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_capture.hpp | 148 | ||||
| -rw-r--r-- | include/internal/catch_resultinfo_builder.hpp | 108 |
2 files changed, 109 insertions, 147 deletions
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 32928163..45362eb4 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -1,17 +1,14 @@ /* - * catch_capture.hpp - * Catch - * * Created by Phil on 18/10/2010. * Copyright 2010 Two Blue Cubes Ltd. All rights reserved. * * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - * */ #ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED +#include "catch_resultinfo_builder.hpp" #include "catch_tostring.hpp" #include "catch_resultinfo.hpp" #include "catch_result_type.h" @@ -28,149 +25,6 @@ namespace Catch struct TestFailureException{}; struct DummyExceptionType_DontUse{}; -struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; - -class MutableResultInfo : public ResultInfo -{ -public: - - /////////////////////////////////////////////////////////////////////////// - MutableResultInfo - () - {} - - /////////////////////////////////////////////////////////////////////////// - MutableResultInfo - ( - const char* expr, - bool isNot, - const SourceLineInfo& lineInfo, - const char* macroName, - const char* message = "" - ) - : ResultInfo( expr, ResultWas::Unknown, isNot, lineInfo, macroName, message ) - { - } - - /////////////////////////////////////////////////////////////////////////// - void setResultType - ( - ResultWas::OfType result - ) - { - // Flip bool results if isNot is set - if( m_isNot && result == ResultWas::Ok ) - m_result = ResultWas::ExpressionFailed; - else if( m_isNot && result == ResultWas::ExpressionFailed ) - m_result = ResultWas::Ok; - else - m_result = result; - } - - /////////////////////////////////////////////////////////////////////////// - void setMessage - ( - const std::string& message - ) - { - m_message = message; - } - - /////////////////////////////////////////////////////////////////////////// - void setLineInfo - ( - const SourceLineInfo& lineInfo - ) - { - m_lineInfo = lineInfo; - } - - /////////////////////////////////////////////////////////////////////////// - void setLhs - ( - const std::string& lhs - ) - { - m_lhs = lhs; - } - - /////////////////////////////////////////////////////////////////////////// - void setRhs - ( - const std::string& rhs - ) - { - m_rhs = rhs; - } - - /////////////////////////////////////////////////////////////////////////// - void setOp - ( - const std::string& op - ) - { - m_op = op; - } - - /////////////////////////////////////////////////////////////////////////// - template<typename RhsT> - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || - ( - const RhsT& - ); - - /////////////////////////////////////////////////////////////////////////// - template<typename RhsT> - STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && - ( - const RhsT& - ); - -private: - friend class ResultBuilder; - template<typename T> friend class Expression; - - template<typename T> friend class PtrExpression; - - /////////////////////////////////////////////////////////////////////////// - MutableResultInfo& captureBoolExpression - ( - bool result - ) - { - m_lhs = Catch::toString( result ); - m_op = m_isNot ? "!" : ""; - setResultType( result ? ResultWas::Ok : ResultWas::ExpressionFailed ); - return *this; - } - - /////////////////////////////////////////////////////////////////////////// - template<Internal::Operator Op, typename T1, typename T2> - MutableResultInfo& captureExpression - ( - const T1& lhs, - const T2& rhs - ) - { - setResultType( Internal::compare<Op>( lhs, rhs ) ? ResultWas::Ok : ResultWas::ExpressionFailed ); - m_lhs = Catch::toString( lhs ); - m_rhs = Catch::toString( rhs ); - m_op = Internal::OperatorTraits<Op>::getName(); - return *this; - } - - /////////////////////////////////////////////////////////////////////////// - template<Internal::Operator Op, typename T> - MutableResultInfo& captureExpression - ( - const T* lhs, - int rhs - ) - { - return captureExpression<Op>( lhs, reinterpret_cast<const T*>( rhs ) ); - } -}; - template<typename T> class Expression { diff --git a/include/internal/catch_resultinfo_builder.hpp b/include/internal/catch_resultinfo_builder.hpp new file mode 100644 index 00000000..96923ecc --- /dev/null +++ b/include/internal/catch_resultinfo_builder.hpp @@ -0,0 +1,108 @@ +/* + * Created by Phil on 8/5/2012. + * Copyright 2012 Two Blue Cubes Ltd. All rights reserved. + * + * Distributed under the Boost Software License, Version 1.0. (See accompanying + * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + */ +#ifndef TWOBLUECUBES_CATCH_RESULTINFO_BUILDER_HPP_INCLUDED +#define TWOBLUECUBES_CATCH_RESULTINFO_BUILDER_HPP_INCLUDED + +#include "catch_tostring.hpp" +#include "catch_resultinfo.hpp" +#include "catch_result_type.h" +#include "catch_evaluate.hpp" +#include "catch_common.h" + +namespace Catch +{ + +struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison; + +class MutableResultInfo : public ResultInfo +{ +public: + + MutableResultInfo() {} + + MutableResultInfo( const char* expr, + bool isNot, + const SourceLineInfo& lineInfo, + const char* macroName, + const char* message = "" ) + : ResultInfo( expr, ResultWas::Unknown, isNot, lineInfo, macroName, message ) + {} + + void setResultType( ResultWas::OfType result ) { + // Flip bool results if isNot is set + if( m_isNot && result == ResultWas::Ok ) + m_result = ResultWas::ExpressionFailed; + else if( m_isNot && result == ResultWas::ExpressionFailed ) + m_result = ResultWas::Ok; + else + m_result = result; + } + + void setMessage( const std::string& message ) { + m_message = message; + } + + void setLineInfo( const SourceLineInfo& lineInfo ) { + m_lineInfo = lineInfo; + } + + void setLhs( const std::string& lhs ) { + m_lhs = lhs; + } + + void setRhs( const std::string& rhs ) { + m_rhs = rhs; + } + + void setOp( const std::string& op ) { + m_op = op; + } + + template<typename RhsT> + STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || + ( + const RhsT& + ); + + template<typename RhsT> + STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && + ( + const RhsT& + ); + +private: + friend class ResultBuilder; + template<typename T> friend class Expression; + + template<typename T> friend class PtrExpression; + + MutableResultInfo& captureBoolExpression( bool result ) { + m_lhs = Catch::toString( result ); + m_op = m_isNot ? "!" : ""; + setResultType( result ? ResultWas::Ok : ResultWas::ExpressionFailed ); + return *this; + } + + template<Internal::Operator Op, typename T1, typename T2> + MutableResultInfo& captureExpression( const T1& lhs, const T2& rhs ) { + setResultType( Internal::compare<Op>( lhs, rhs ) ? ResultWas::Ok : ResultWas::ExpressionFailed ); + m_lhs = Catch::toString( lhs ); + m_rhs = Catch::toString( rhs ); + m_op = Internal::OperatorTraits<Op>::getName(); + return *this; + } + + template<Internal::Operator Op, typename T> + MutableResultInfo& captureExpression( const T* lhs, int rhs ) { + return captureExpression<Op>( lhs, reinterpret_cast<const T*>( rhs ) ); + } +}; + +} // end namespace Catch + +#endif // TWOBLUECUBES_CATCH_RESULTINFO_BUILDER_HPP_INCLUDED |