diff options
author | Andy Soffer <asoffer@google.com> | 2019-10-16 18:32:31 (GMT) |
---|---|---|
committer | Andy Soffer <asoffer@google.com> | 2019-10-16 18:32:31 (GMT) |
commit | bdc29d5dc19dd802907ea37a80ce5dc9afe0898d (patch) | |
tree | c01044e04caf77c9f5f2412df61d527b2b25c7c8 /googlemock | |
parent | 4c25e2b87fcb78abcfdee2739db9ed7a19754cd3 (diff) | |
parent | 90a8ab70a1f604f35801569683450834f5e6ce3b (diff) | |
download | googletest-bdc29d5dc19dd802907ea37a80ce5dc9afe0898d.zip googletest-bdc29d5dc19dd802907ea37a80ce5dc9afe0898d.tar.gz googletest-bdc29d5dc19dd802907ea37a80ce5dc9afe0898d.tar.bz2 |
Merge pull request #2421 from kuzkry:cleanup-for-regex
PiperOrigin-RevId: 275058934
Diffstat (limited to 'googlemock')
-rw-r--r-- | googlemock/docs/cheat_sheet.md | 6 | ||||
-rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/docs/cheat_sheet.md b/googlemock/docs/cheat_sheet.md index 850963a..8ec5ea0 100644 --- a/googlemock/docs/cheat_sheet.md +++ b/googlemock/docs/cheat_sheet.md @@ -325,9 +325,9 @@ The `argument` can be either a C string or a C++ string object: `ContainsRegex()` and `MatchesRegex()` take ownership of the `RE` object. They use the regular expression syntax defined -[here](../../googletest/docs/advanced.md#regular-expression-syntax). -`StrCaseEq()`, `StrCaseNe()`, `StrEq()`, and `StrNe()` work for wide strings as -well. +[here](../../googletest/docs/advanced.md#regular-expression-syntax). All of +these matchers, except `ContainsRegex()` and `MatchesRegex()` work for wide +strings as well. #### Container Matchers diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 7bf5a8a..791a247 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -69,8 +69,8 @@ using testing::AtMost; using testing::Between; using testing::Cardinality; using testing::CardinalityInterface; -using testing::ContainsRegex; using testing::Const; +using testing::ContainsRegex; using testing::DoAll; using testing::DoDefault; using testing::Eq; |