diff options
| author | Vladimir Goncharov <amatanhead@yandex-team.ru> | 2020-07-07 16:01:58 (GMT) |
|---|---|---|
| committer | Vladimir Goncharov <amatanhead@yandex-team.ru> | 2020-08-03 20:47:57 (GMT) |
| commit | 69c510fb5137160b532e1c7e9bec9e660c14b193 (patch) | |
| tree | d97a0b01bc98c52a2052c41a55f3d6d3b03e309e /googlemock/include/gmock/gmock-matchers.h | |
| parent | 49d1201a7ec83987deaae161958577deeba1a9ed (diff) | |
| download | googletest-69c510fb5137160b532e1c7e9bec9e660c14b193.zip googletest-69c510fb5137160b532e1c7e9bec9e660c14b193.tar.gz googletest-69c510fb5137160b532e1c7e9bec9e660c14b193.tar.bz2 | |
Add a test for duplicate catch clauses in throw matchers, fix a couple of nitpicks.
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 708c7c8..3662520 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -4738,7 +4738,6 @@ class ExceptionMatcherImpl { ExceptionMatcherImpl(Matcher<const Err&> matcher) : matcher_(std::move(matcher)) {} - public: void DescribeTo(::std::ostream* os) const { *os << "throws an exception of type " << GetTypeName<Err>(); if (matcher_.GetDescriber() != nullptr) { @@ -4775,7 +4774,7 @@ class ExceptionMatcherImpl { *listener << "with description \"" << err.what() << "\""; return false; } catch (...) { - *listener << "throws an exception of some other type"; + *listener << "throws an exception of an unknown type"; return false; } *listener << "does not throw any exception"; |