gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a test for duplicate catch clauses in throw matchers, fix a couple of nitpicks.

Browse Source
This commit is contained in:
Vladimir Goncharov 2020-07-07 19:01:58 +03:00
parent 49d1201a7e
commit 69c510fb51
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
googlemock/include/gmock/gmock-matchers.h
View File

@ -4738,7 +4738,6 @@ class ExceptionMatcherImpl {
ExceptionMatcherImpl(Matcher<const Err&> matcher) ExceptionMatcherImpl(Matcher<const Err&> matcher)
: matcher_(std::move(matcher)) {} : matcher_(std::move(matcher)) {}
public:
void DescribeTo(::std::ostream* os) const { void DescribeTo(::std::ostream* os) const {
*os << "throws an exception of type " << GetTypeName<Err>(); *os << "throws an exception of type " << GetTypeName<Err>();
if (matcher_.GetDescriber() != nullptr) { if (matcher_.GetDescriber() != nullptr) {
@ -4775,7 +4774,7 @@ class ExceptionMatcherImpl {
*listener << "with description \"" << err.what() << "\""; *listener << "with description \"" << err.what() << "\"";
return false; return false;
} catch (...) { } catch (...) {
*listener << "throws an exception of some other type"; *listener << "throws an exception of an unknown type";
return false; return false;
} }
*listener << "does not throw any exception"; *listener << "does not throw any exception";

6
googlemock/test/gmock-matchers_test.cc
View File

@ -8139,6 +8139,12 @@ TEST(ThrowsTest, Examples) {
Property(&std::runtime_error::what, HasSubstr("message")))); Property(&std::runtime_error::what, HasSubstr("message"))));
} }
TEST(ThrowsTest, DoesNotGenerateDuplicateCatchClauseWarning) {
EXPECT_THAT(
[]() { throw std::exception(); },
Throws<std::exception>());
}
TEST(ThrowsTest, Describe) { TEST(ThrowsTest, Describe) {
Matcher<void (*)()> matcher = Throws<std::runtime_error>(); Matcher<void (*)()> matcher = Throws<std::runtime_error>();
std::stringstream ss; std::stringstream ss;