From c563f6b1be28f9aa88aa34a0467f5c3cb4421352 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 25 Mar 2013 09:24:13 +0000 Subject: [PATCH] Wrap expr results if they contain newlines --- include/internal/catch_expressionresult_builder.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/internal/catch_expressionresult_builder.hpp b/include/internal/catch_expressionresult_builder.hpp index a0921c9a..c1484fb7 100644 --- a/include/internal/catch_expressionresult_builder.hpp +++ b/include/internal/catch_expressionresult_builder.hpp @@ -82,7 +82,9 @@ namespace Catch { else if( m_exprComponents.op == "matches" ) return m_exprComponents.lhs + " " + m_exprComponents.rhs; else if( m_exprComponents.op != "!" ) { - if( m_exprComponents.lhs.size() + m_exprComponents.rhs.size() < 40 ) + if( m_exprComponents.lhs.size() + m_exprComponents.rhs.size() < 40 && + m_exprComponents.lhs.find("\n") == std::string::npos && + m_exprComponents.rhs.find("\n") == std::string::npos ) return m_exprComponents.lhs + " " + m_exprComponents.op + " " + m_exprComponents.rhs; else return m_exprComponents.lhs + "\n" + m_exprComponents.op + "\n" + m_exprComponents.rhs;