Merge pull request #2421 from kuzkry:cleanup-for-regex

PiperOrigin-RevId: 275058934
This commit is contained in:
Andy Soffer 2019-10-16 14:32:31 -04:00
commit bdc29d5dc1
3 changed files with 4 additions and 5 deletions

View File

@ -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

View File

@ -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;

View File

@ -219,7 +219,6 @@ using ::testing::PrintToString;
using ::testing::internal::FormatForComparisonFailureMessage;
using ::testing::internal::ImplicitCast_;
using ::testing::internal::NativeArray;
using ::testing::internal::RE;
using ::testing::internal::RelationToSourceReference;
using ::testing::internal::Strings;
using ::testing::internal::UniversalPrint;