From c96da8fea82ec30325a94b78645e8453bddd1dca Mon Sep 17 00:00:00 2001 From: Krystian Kuzniarek Date: Thu, 22 Aug 2019 22:16:01 +0200 Subject: change usings --- googlemock/test/gmock-spec-builders_test.cc | 2 +- googletest/test/googletest-printers-test.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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; diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc index 4bdc9ad..58be7d1 100644 --- a/googletest/test/googletest-printers-test.cc +++ b/googletest/test/googletest-printers-test.cc @@ -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; -- cgit v0.12 From 90a8ab70a1f604f35801569683450834f5e6ce3b Mon Sep 17 00:00:00 2001 From: Krystian Kuzniarek Date: Thu, 22 Aug 2019 22:41:10 +0200 Subject: mention the existing support for wide strings in string matchers --- googlemock/docs/cheat_sheet.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googlemock/docs/cheat_sheet.md b/googlemock/docs/cheat_sheet.md index 850963a..1f7ed92 100644 --- a/googlemock/docs/cheat_sheet.md +++ b/googlemock/docs/cheat_sheet.md @@ -326,8 +326,8 @@ 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. +All of these matchers, except `ContainsRegex()` and `MatchesRegex()` work for +wide strings as well. #### Container Matchers -- cgit v0.12