Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-08-18 13:44:37 +0200
committerMartin Hořeňovský2020-08-18 21:02:30 +0200
commite418e75c74274354b4c2c7597d919929426d89c8 (patch)
tree13eeb7f7cce541a7da9ca102b240033b7e4f2bd6 /src/catch2
parent6a46b344c02b2548b11e4b66f95618bd5c90d110 (diff)
downloadcatch3-e418e75c74274354b4c2c7597d919929426d89c8.tar.gz
Turn CaseSensitive into proper enum class
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/internal/catch_case_sensitive.hpp4
-rw-r--r--src/catch2/internal/catch_wildcard_pattern.cpp2
-rw-r--r--src/catch2/internal/catch_wildcard_pattern.hpp4
-rw-r--r--src/catch2/matchers/catch_matchers_string.cpp18
-rw-r--r--src/catch2/matchers/catch_matchers_string.hpp18
5 files changed, 22 insertions, 24 deletions
diff --git a/src/catch2/internal/catch_case_sensitive.hpp b/src/catch2/internal/catch_case_sensitive.hpp
index ad765546..4d57107a 100644
--- a/src/catch2/internal/catch_case_sensitive.hpp
+++ b/src/catch2/internal/catch_case_sensitive.hpp
@@ -3,9 +3,7 @@
namespace Catch {
- struct CaseSensitive {
- enum Choice { Yes, No };
- };
+ enum class CaseSensitive { Yes, No };
} // namespace Catch
diff --git a/src/catch2/internal/catch_wildcard_pattern.cpp b/src/catch2/internal/catch_wildcard_pattern.cpp
index 9013984f..f140bf29 100644
--- a/src/catch2/internal/catch_wildcard_pattern.cpp
+++ b/src/catch2/internal/catch_wildcard_pattern.cpp
@@ -12,7 +12,7 @@
namespace Catch {
WildcardPattern::WildcardPattern( std::string const& pattern,
- CaseSensitive::Choice caseSensitivity )
+ CaseSensitive caseSensitivity )
: m_caseSensitivity( caseSensitivity ),
m_pattern( normaliseString( pattern ) )
{
diff --git a/src/catch2/internal/catch_wildcard_pattern.hpp b/src/catch2/internal/catch_wildcard_pattern.hpp
index 1dea8670..749f62da 100644
--- a/src/catch2/internal/catch_wildcard_pattern.hpp
+++ b/src/catch2/internal/catch_wildcard_pattern.hpp
@@ -24,13 +24,13 @@ namespace Catch
public:
- WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+ WildcardPattern( std::string const& pattern, CaseSensitive caseSensitivity );
virtual ~WildcardPattern() = default;
virtual bool matches( std::string const& str ) const;
private:
std::string normaliseString( std::string const& str ) const;
- CaseSensitive::Choice m_caseSensitivity;
+ CaseSensitive m_caseSensitivity;
WildcardPosition m_wildcard = NoWildcard;
std::string m_pattern;
};
diff --git a/src/catch2/matchers/catch_matchers_string.cpp b/src/catch2/matchers/catch_matchers_string.cpp
index 15905283..25afa967 100644
--- a/src/catch2/matchers/catch_matchers_string.cpp
+++ b/src/catch2/matchers/catch_matchers_string.cpp
@@ -12,7 +12,7 @@
namespace Catch {
namespace Matchers {
- CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+ CasedString::CasedString( std::string const& str, CaseSensitive caseSensitivity )
: m_caseSensitivity( caseSensitivity ),
m_str( adjustString( str ) )
{}
@@ -74,11 +74,11 @@ namespace Matchers {
- RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+ RegexMatcher::RegexMatcher(std::string regex, CaseSensitive caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
bool RegexMatcher::match(std::string const& matchee) const {
auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
- if (m_caseSensitivity == CaseSensitive::Choice::No) {
+ if (m_caseSensitivity == CaseSensitive::No) {
flags |= std::regex::icase;
}
auto reg = std::regex(m_regex, flags);
@@ -86,24 +86,24 @@ namespace Matchers {
}
std::string RegexMatcher::describe() const {
- return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+ return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Yes)? " case sensitively" : " case insensitively");
}
- StringEqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ StringEqualsMatcher Equals( std::string const& str, CaseSensitive caseSensitivity ) {
return StringEqualsMatcher( CasedString( str, caseSensitivity) );
}
- StringContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ StringContainsMatcher Contains( std::string const& str, CaseSensitive caseSensitivity ) {
return StringContainsMatcher( CasedString( str, caseSensitivity) );
}
- EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ EndsWithMatcher EndsWith( std::string const& str, CaseSensitive caseSensitivity ) {
return EndsWithMatcher( CasedString( str, caseSensitivity) );
}
- StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+ StartsWithMatcher StartsWith( std::string const& str, CaseSensitive caseSensitivity ) {
return StartsWithMatcher( CasedString( str, caseSensitivity) );
}
- RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+ RegexMatcher Matches(std::string const& regex, CaseSensitive caseSensitivity) {
return RegexMatcher(regex, caseSensitivity);
}
diff --git a/src/catch2/matchers/catch_matchers_string.hpp b/src/catch2/matchers/catch_matchers_string.hpp
index 5ad147ac..abbf57b7 100644
--- a/src/catch2/matchers/catch_matchers_string.hpp
+++ b/src/catch2/matchers/catch_matchers_string.hpp
@@ -17,11 +17,11 @@ namespace Catch {
namespace Matchers {
struct CasedString {
- CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+ CasedString( std::string const& str, CaseSensitive caseSensitivity );
std::string adjustString( std::string const& str ) const;
std::string caseSensitivitySuffix() const;
- CaseSensitive::Choice m_caseSensitivity;
+ CaseSensitive m_caseSensitivity;
std::string m_str;
};
@@ -51,25 +51,25 @@ namespace Matchers {
};
struct RegexMatcher final : MatcherBase<std::string> {
- RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+ RegexMatcher( std::string regex, CaseSensitive caseSensitivity );
bool match( std::string const& matchee ) const override;
std::string describe() const override;
private:
std::string m_regex;
- CaseSensitive::Choice m_caseSensitivity;
+ CaseSensitive m_caseSensitivity;
};
//! Creates matcher that accepts strings that are exactly equal to `str`
- StringEqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StringEqualsMatcher Equals( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
//! Creates matcher that accepts strings that contain `str`
- StringContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StringContainsMatcher Contains( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
//! Creates matcher that accepts strings that _end_ with `str`
- EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ EndsWithMatcher EndsWith( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
//! Creates matcher that accepts strings that _start_ with `str`
- StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ StartsWithMatcher StartsWith( std::string const& str, CaseSensitive caseSensitivity = CaseSensitive::Yes );
//! Creates matcher that accepts strings matching `regex`
- RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+ RegexMatcher Matches( std::string const& regex, CaseSensitive caseSensitivity = CaseSensitive::Yes );
} // namespace Matchers
} // namespace Catch