3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use StringRefs for operation name in StringMatcherBase

Browse Source
This commit is contained in:
Martin Hořeňovský 2022-04-11 10:58:45 +02:00
parent be948f1fd0
commit 195a6ac941
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/catch2/matchers/catch_matchers_string.cpp
View File

@ -31,7 +31,7 @@ namespace Matchers {
} }
StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator ) StringMatcherBase::StringMatcherBase( StringRef operation, CasedString const& comparator )
: m_comparator( comparator ), : m_comparator( comparator ),
m_operation( operation ) { m_operation( operation ) {
} }
@ -48,28 +48,28 @@ namespace Matchers {
return description; return description;
} }
StringEqualsMatcher::StringEqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {} StringEqualsMatcher::StringEqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals"_sr, comparator ) {}
bool StringEqualsMatcher::match( std::string const& source ) const { bool StringEqualsMatcher::match( std::string const& source ) const {
return m_comparator.adjustString( source ) == m_comparator.m_str; return m_comparator.adjustString( source ) == m_comparator.m_str;
} }
StringContainsMatcher::StringContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {} StringContainsMatcher::StringContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains"_sr, comparator ) {}
bool StringContainsMatcher::match( std::string const& source ) const { bool StringContainsMatcher::match( std::string const& source ) const {
return contains( m_comparator.adjustString( source ), m_comparator.m_str ); return contains( m_comparator.adjustString( source ), m_comparator.m_str );
} }
StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {} StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with"_sr, comparator ) {}
bool StartsWithMatcher::match( std::string const& source ) const { bool StartsWithMatcher::match( std::string const& source ) const {
return startsWith( m_comparator.adjustString( source ), m_comparator.m_str ); return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
} }
EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {} EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with"_sr, comparator ) {}
bool EndsWithMatcher::match( std::string const& source ) const { bool EndsWithMatcher::match( std::string const& source ) const {
return endsWith( m_comparator.adjustString( source ), m_comparator.m_str ); return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );

4
src/catch2/matchers/catch_matchers_string.hpp
View File

@ -27,11 +27,11 @@ namespace Matchers {
}; };
struct StringMatcherBase : MatcherBase<std::string> { struct StringMatcherBase : MatcherBase<std::string> {
StringMatcherBase( std::string const& operation, CasedString const& comparator ); StringMatcherBase( StringRef operation, CasedString const& comparator );
std::string describe() const override; std::string describe() const override;
CasedString m_comparator; CasedString m_comparator;
std::string m_operation; StringRef m_operation;
}; };
struct StringEqualsMatcher final : StringMatcherBase { struct StringEqualsMatcher final : StringMatcherBase {