From b84e08ad6f11bd5981c540b7e6ed5bc7239fbae0 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Fri, 22 Jan 2016 07:50:59 +0000 Subject: [PATCH] Fix EndsWith Matcher (and refactored EndsWith and StartsWith in terms of endsWith and startsWith) (see Issue #573) --- include/internal/catch_matchers.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.hpp index cfc2451a..ab8fec15 100644 --- a/include/internal/catch_matchers.hpp +++ b/include/internal/catch_matchers.hpp @@ -234,7 +234,7 @@ namespace Matchers { virtual ~StartsWith(); virtual bool match( std::string const& expr ) const { - return m_data.adjustString( expr ).find( m_data.m_str ) == 0; + return startsWith( m_data.adjustString( expr ), m_data.m_str ); } virtual std::string toString() const { return "starts with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix(); @@ -251,7 +251,7 @@ namespace Matchers { virtual ~EndsWith(); virtual bool match( std::string const& expr ) const { - return m_data.adjustString( expr ).find( m_data.m_str ) == expr.size() - m_data.m_str.size(); + return endsWith( m_data.adjustString( expr ), m_data.m_str ); } virtual std::string toString() const { return "ends with: \"" + m_data.m_str + "\"" + m_data.toStringSuffix();