diff options
| author | Mathias Stearn <mathias@10gen.com> | 2017-07-19 16:10:23 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2017-07-26 15:13:34 -0400 |
| commit | 044bf07073d0d45cbb9b61b843fa33074599971f (patch) | |
| tree | b530d6738eaffea9f445bf1b7261190c8d25ee86 /src/mongo/unittest/unittest_test.cpp | |
| parent | c42b5fcd1f9246a76e61eb917342ea303a8f4ed2 (diff) | |
| download | mongo-044bf07073d0d45cbb9b61b843fa33074599971f.tar.gz | |
SERVER-30235 Improve failure messages from ASSERT_THROWS_CODE and friends
Diffstat (limited to 'src/mongo/unittest/unittest_test.cpp')
| -rw-r--r-- | src/mongo/unittest/unittest_test.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mongo/unittest/unittest_test.cpp b/src/mongo/unittest/unittest_test.cpp index 03c00a34712..ad919735595 100644 --- a/src/mongo/unittest/unittest_test.cpp +++ b/src/mongo/unittest/unittest_test.cpp @@ -51,14 +51,11 @@ bool containsPattern(const std::string& pattern, const std::string& value) { #define ASSERT_TEST_FAILS(TEST_STMT) \ ASSERT_THROWS(TEST_STMT, mongo::unittest::TestAssertionFailureException) -#define ASSERT_TEST_FAILS_MATCH(TEST_STMT, PATTERN) \ - ASSERT_THROWS_PRED( \ - TEST_STMT, \ - mongo::unittest::TestAssertionFailureException, \ - stdx::bind(containsPattern, \ - PATTERN, \ - stdx::bind(&mongo::unittest::TestAssertionFailureException::getMessage, \ - stdx::placeholders::_1))) +#define ASSERT_TEST_FAILS_MATCH(TEST_STMT, PATTERN) \ + ASSERT_THROWS_WITH_CHECK( \ + TEST_STMT, mongo::unittest::TestAssertionFailureException, ([&](const auto& ex) { \ + ASSERT_STRING_CONTAINS(ex.getMessage(), (PATTERN)); \ + })) TEST(UnitTestSelfTest, DoNothing) {} |