Skip to content

Commit 6f5fd0d

Browse files
Abseil Teammbxx
Abseil Team
authored and
mbxx
committed
Googletest export
Add gmock Matcher<std::string_view> specialization. PiperOrigin-RevId: 294443240
1 parent d093073 commit 6f5fd0d

File tree

7 files changed

+197
-164
lines changed

7 files changed

+197
-164
lines changed

‎googlemock/include/gmock/gmock-matchers.h

+20-20
Original file line numberDiff line numberDiff line change
@@ -906,15 +906,15 @@ class StrEqualityMatcher {
906906
bool case_sensitive)
907907
: string_(str), expect_eq_(expect_eq), case_sensitive_(case_sensitive) {}
908908

909-
#if GTEST_HAS_ABSL
910-
bool MatchAndExplain(const absl::string_view& s,
909+
#if GTEST_INTERNAL_HAS_STRING_VIEW
910+
bool MatchAndExplain(const internal::StringView& s,
911911
MatchResultListener* listener) const {
912-
// This should fail to compile if absl::string_view is used with wide
912+
// This should fail to compile if StringView is used with wide
913913
// strings.
914914
const StringType& str = std::string(s);
915915
return MatchAndExplain(str, listener);
916916
}
917-
#endif // GTEST_HAS_ABSL
917+
#endif // GTEST_INTERNAL_HAS_STRING_VIEW
918918

919919
// Accepts pointer types, particularly:
920920
// const char*
@@ -932,7 +932,7 @@ class StrEqualityMatcher {
932932
// Matches anything that can convert to StringType.
933933
//
934934
// This is a template, not just a plain function with const StringType&,
935-
// because absl::string_view has some interfering non-explicit constructors.
935+
// because StringView has some interfering non-explicit constructors.
936936
template <typename MatcheeStringType>
937937
bool MatchAndExplain(const MatcheeStringType& s,
938938
MatchResultListener* /* listener */) const {
@@ -976,15 +976,15 @@ class HasSubstrMatcher {
976976
explicit HasSubstrMatcher(const StringType& substring)
977977
: substring_(substring) {}
978978

979-
#if GTEST_HAS_ABSL
980-
bool MatchAndExplain(const absl::string_view& s,
979+
#if GTEST_INTERNAL_HAS_STRING_VIEW
980+
bool MatchAndExplain(const internal::StringView& s,
981981
MatchResultListener* listener) const {
982-
// This should fail to compile if absl::string_view is used with wide
982+
// This should fail to compile if StringView is used with wide
983983
// strings.
984984
const StringType& str = std::string(s);
985985
return MatchAndExplain(str, listener);
986986
}
987-
#endif // GTEST_HAS_ABSL
987+
#endif // GTEST_INTERNAL_HAS_STRING_VIEW
988988

989989
// Accepts pointer types, particularly:
990990
// const char*
@@ -999,7 +999,7 @@ class HasSubstrMatcher {
999999
// Matches anything that can convert to StringType.
10001000
//
10011001
// This is a template, not just a plain function with const StringType&,
1002-
// because absl::string_view has some interfering non-explicit constructors.
1002+
// because StringView has some interfering non-explicit constructors.
10031003
template <typename MatcheeStringType>
10041004
bool MatchAndExplain(const MatcheeStringType& s,
10051005
MatchResultListener* /* listener */) const {
@@ -1032,15 +1032,15 @@ class StartsWithMatcher {
10321032
explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) {
10331033
}
10341034

1035-
#if GTEST_HAS_ABSL
1036-
bool MatchAndExplain(const absl::string_view& s,
1035+
#if GTEST_INTERNAL_HAS_STRING_VIEW
1036+
bool MatchAndExplain(const internal::StringView& s,
10371037
MatchResultListener* listener) const {
1038-
// This should fail to compile if absl::string_view is used with wide
1038+
// This should fail to compile if StringView is used with wide
10391039
// strings.
10401040
const StringType& str = std::string(s);
10411041
return MatchAndExplain(str, listener);
10421042
}
1043-
#endif // GTEST_HAS_ABSL
1043+
#endif // GTEST_INTERNAL_HAS_STRING_VIEW
10441044

10451045
// Accepts pointer types, particularly:
10461046
// const char*
@@ -1055,7 +1055,7 @@ class StartsWithMatcher {
10551055
// Matches anything that can convert to StringType.
10561056
//
10571057
// This is a template, not just a plain function with const StringType&,
1058-
// because absl::string_view has some interfering non-explicit constructors.
1058+
// because StringView has some interfering non-explicit constructors.
10591059
template <typename MatcheeStringType>
10601060
bool MatchAndExplain(const MatcheeStringType& s,
10611061
MatchResultListener* /* listener */) const {
@@ -1088,15 +1088,15 @@ class EndsWithMatcher {
10881088
public:
10891089
explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {}
10901090

1091-
#if GTEST_HAS_ABSL
1092-
bool MatchAndExplain(const absl::string_view& s,
1091+
#if GTEST_INTERNAL_HAS_STRING_VIEW
1092+
bool MatchAndExplain(const internal::StringView& s,
10931093
MatchResultListener* listener) const {
1094-
// This should fail to compile if absl::string_view is used with wide
1094+
// This should fail to compile if StringView is used with wide
10951095
// strings.
10961096
const StringType& str = std::string(s);
10971097
return MatchAndExplain(str, listener);
10981098
}
1099-
#endif // GTEST_HAS_ABSL
1099+
#endif // GTEST_INTERNAL_HAS_STRING_VIEW
11001100

11011101
// Accepts pointer types, particularly:
11021102
// const char*
@@ -1111,7 +1111,7 @@ class EndsWithMatcher {
11111111
// Matches anything that can convert to StringType.
11121112
//
11131113
// This is a template, not just a plain function with const StringType&,
1114-
// because absl::string_view has some interfering non-explicit constructors.
1114+
// because StringView has some interfering non-explicit constructors.
11151115
template <typename MatcheeStringType>
11161116
bool MatchAndExplain(const MatcheeStringType& s,
11171117
MatchResultListener* /* listener */) const {

0 commit comments

Comments
 (0)