diff options
author | Abseil Team <absl-team@google.com> | 2018-12-10 22:46:47 -0500 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-12-11 10:11:01 -0500 |
commit | 06bb8d4d6dcfd1a6111794467676500d955cb144 (patch) | |
tree | deb33fc4bb37c5df30b49e91467dfb8e4a61b91f /googlemock/include/gmock | |
parent | 695cf7c96249de50360a7d2951dc88eb3aea0695 (diff) | |
download | googletest-06bb8d4d6dcfd1a6111794467676500d955cb144.tar.gz googletest-06bb8d4d6dcfd1a6111794467676500d955cb144.tar.bz2 googletest-06bb8d4d6dcfd1a6111794467676500d955cb144.zip |
Googletest export
The gmock matchers have a concept of MatchAndExpain; where the details of the
matching are written to a "result listener". A matcher can avoid creating
expensive debug info by checking result_listener->IsInterested(); but,
unfortunately, the default matcher code (called from EXPECT_THAT) is always
"interested".
This change implements EXPECT_THAT matching to first run the matcher in a "not
interested" mode; and then run it a second time ("interested") only if the
match fails.
PiperOrigin-RevId: 224929783
Diffstat (limited to 'googlemock/include/gmock')
-rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index b859f1aa..68278bea 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1296,14 +1296,24 @@ class PredicateFormatterFromMatcher { // We don't write MatcherCast<const T&> either, as that allows // potentially unsafe downcasting of the matcher argument. const Matcher<const T&> matcher = SafeMatcherCast<const T&>(matcher_); - StringMatchResultListener listener; - if (MatchPrintAndExplain(x, matcher, &listener)) + + // The expected path here is that the matcher should match (i.e. that most + // tests pass) so optimize for this case. + if (matcher.Matches(x)) { return AssertionSuccess(); + } ::std::stringstream ss; ss << "Value of: " << value_text << "\n" << "Expected: "; matcher.DescribeTo(&ss); + + // Rerun the matcher to "PrintAndExain" the failure. + StringMatchResultListener listener; + if (MatchPrintAndExplain(x, matcher, &listener)) { + ss << "\n The matcher failed on the initial attempt; but passed when " + "rerun to generate the explanation."; + } ss << "\n Actual: " << listener.str(); return AssertionFailure() << ss.str(); } |